264 lines
10 KiB
Diff
264 lines
10 KiB
Diff
diff -up xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp.gcc43 2008-02-13 23:11:04.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp 2008-02-13 23:11:44.000000000 -0500
|
|
@@ -23,6 +23,7 @@
|
|
#include <expat.h>
|
|
#include <map>
|
|
#include <set>
|
|
+#include <cstring>
|
|
#include "xmlfilterreader.h"
|
|
|
|
using namespace std;
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp.gcc43 2008-02-13 22:50:22.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp 2008-02-13 22:51:01.000000000 -0500
|
|
@@ -21,6 +21,7 @@
|
|
#include <vector>
|
|
#include <stdexcept>
|
|
#include <expat.h>
|
|
+#include <cstring>
|
|
#include "xmlassociatexsl.h"
|
|
|
|
XmlAssociateXsl::XmlAssociateXsl ( const std::string& path, size_t size ) :
|
|
diff -up xmlcopyeditor-1.1.0.6/src/housestylewriter.h.gcc43 xmlcopyeditor-1.1.0.6/src/housestylewriter.h
|
|
--- xmlcopyeditor-1.1.0.6/src/housestylewriter.h.gcc43 2008-02-13 23:46:54.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/housestylewriter.h 2008-02-13 23:47:07.000000000 -0500
|
|
@@ -23,6 +23,7 @@
|
|
#include <set>
|
|
#include <string>
|
|
#include <expat.h>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
#include "wrapregex.h"
|
|
#include "contexthandler.h"
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h.gcc43 2008-02-13 22:35:15.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h 2008-02-13 22:35:36.000000000 -0500
|
|
@@ -24,6 +24,7 @@
|
|
#include <expat.h>
|
|
#include <string>
|
|
#include <map>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
struct AssociateXsdData : public ParserData
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlwordcount.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlwordcount.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlwordcount.h.gcc43 2008-02-13 23:52:56.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlwordcount.h 2008-02-13 23:53:06.000000000 -0500
|
|
@@ -21,6 +21,7 @@
|
|
#define XML_WORD_COUNT_H
|
|
|
|
#include <string>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
struct WordCountData : public ParserData
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h.gcc43 2008-02-13 22:58:11.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h 2008-02-13 22:59:00.000000000 -0500
|
|
@@ -26,6 +26,7 @@
|
|
#include <vector>
|
|
#include <utility>
|
|
#include <expat.h>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
struct XmlShallowValidatorData : public ParserData
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h.gcc43 2008-02-14 00:01:03.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h 2008-02-14 00:01:20.000000000 -0500
|
|
@@ -22,6 +22,7 @@
|
|
|
|
#include <expat.h>
|
|
#include <string>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
struct EncodingData : public ParserData
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h.gcc43 2008-02-13 23:28:10.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h 2008-02-13 23:28:34.000000000 -0500
|
|
@@ -22,6 +22,7 @@
|
|
|
|
#include <expat.h>
|
|
#include <string>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
struct SchemaLocatorData
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h.gcc43 2008-02-13 22:58:11.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h 2008-02-13 22:58:33.000000000 -0500
|
|
@@ -23,6 +23,7 @@
|
|
#include <expat.h>
|
|
#include <map>
|
|
#include <set>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
#include "parserdata.h"
|
|
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h.gcc43 2008-02-13 22:26:41.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h 2008-02-13 22:26:58.000000000 -0500
|
|
@@ -23,6 +23,7 @@
|
|
#include <vector>
|
|
#include <expat.h>
|
|
#include <string>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
struct DtdData : public ParserData
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp.gcc43 2008-02-13 22:58:11.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp 2008-02-13 22:59:23.000000000 -0500
|
|
@@ -22,6 +22,7 @@
|
|
#include "xmlshallowvalidator.h"
|
|
#include "xmlencodinghandler.h"
|
|
#include <utility>
|
|
+#include <memory>
|
|
|
|
// adapted from wxSTEdit (c) 2005 John Labenski, Otto Wyss
|
|
#define XMLCTRL_HASBIT(value, bit) (((value) & (bit)) != 0)
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h.gcc43 2008-02-13 23:11:04.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h 2008-02-13 23:11:35.000000000 -0500
|
|
@@ -25,6 +25,7 @@
|
|
#include <map>
|
|
#include <set>
|
|
#include <expat.h>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
using namespace std;
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h.gcc43 2008-02-13 22:35:52.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h 2008-02-13 22:36:09.000000000 -0500
|
|
@@ -23,6 +23,7 @@
|
|
#include <vector>
|
|
#include <expat.h>
|
|
#include <string>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
struct ParseSchemaNsData : public ParserData
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h.gcc43 2008-02-13 23:34:17.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h 2008-02-13 23:34:32.000000000 -0500
|
|
@@ -23,6 +23,7 @@
|
|
#include <vector>
|
|
#include <expat.h>
|
|
#include <string>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
struct UtfData : public ParserData
|
|
diff -up xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp
|
|
--- xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp.gcc43 2008-02-13 19:59:16.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp 2008-02-13 19:59:26.000000000 -0500
|
|
@@ -19,6 +19,7 @@
|
|
|
|
#include "globalreplacedialog.h"
|
|
#include "wrapregex.h"
|
|
+#include <memory>
|
|
|
|
BEGIN_EVENT_TABLE ( GlobalReplaceDialog, wxDialog )
|
|
EVT_BUTTON ( wxID_OK, GlobalReplaceDialog::OnOk )
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xsllocator.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xsllocator.cpp
|
|
--- xmlcopyeditor-1.1.0.6/src/xsllocator.cpp.gcc43 2008-02-13 23:40:13.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xsllocator.cpp 2008-02-13 23:40:46.000000000 -0500
|
|
@@ -21,6 +21,7 @@
|
|
#include <vector>
|
|
#include <stdexcept>
|
|
#include <expat.h>
|
|
+#include <cstring>
|
|
#include "xsllocator.h"
|
|
|
|
XslLocator::XslLocator() : d ( new XslLocatorData() )
|
|
diff -up xmlcopyeditor-1.1.0.6/src/housestylereader.h.gcc43 xmlcopyeditor-1.1.0.6/src/housestylereader.h
|
|
--- xmlcopyeditor-1.1.0.6/src/housestylereader.h.gcc43 2008-02-13 22:13:55.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/housestylereader.h 2008-02-13 22:13:59.000000000 -0500
|
|
@@ -25,6 +25,7 @@
|
|
#include <set>
|
|
#include <vector>
|
|
#include <expat.h>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
using namespace std;
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h.gcc43 2008-02-13 22:49:52.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h 2008-02-13 22:50:09.000000000 -0500
|
|
@@ -23,6 +23,7 @@
|
|
#include <vector>
|
|
#include <expat.h>
|
|
#include <string>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
struct XslData : public ParserData
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp.gcc43 2008-02-13 22:43:24.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp 2008-02-13 22:43:42.000000000 -0500
|
|
@@ -21,6 +21,7 @@
|
|
#include <vector>
|
|
#include <stdexcept>
|
|
#include <expat.h>
|
|
+#include <cstring>
|
|
#include "xmlassociatexsd.h"
|
|
#include "xmlparseschemans.h"
|
|
#include "readfile.h"
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp.gcc43 2008-02-13 23:28:10.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp 2008-02-13 23:28:46.000000000 -0500
|
|
@@ -21,6 +21,7 @@
|
|
#include <vector>
|
|
#include <stdexcept>
|
|
#include <expat.h>
|
|
+#include <cstring>
|
|
#include "xmlschemalocator.h"
|
|
|
|
XmlSchemaLocator::XmlSchemaLocator() :
|
|
diff -up xmlcopyeditor-1.1.0.6/src/stringset.h.gcc43 xmlcopyeditor-1.1.0.6/src/stringset.h
|
|
--- xmlcopyeditor-1.1.0.6/src/stringset.h.gcc43 2008-02-13 20:22:00.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/stringset.h 2008-02-13 20:22:18.000000000 -0500
|
|
@@ -24,6 +24,7 @@
|
|
#include <stdexcept>
|
|
#include <cmath>
|
|
#include <climits>
|
|
+#include <cstring>
|
|
#ifdef __WXMSW__
|
|
#include <mem.h>
|
|
#endif
|
|
diff -up xmlcopyeditor-1.1.0.6/src/wrapregex.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/wrapregex.cpp
|
|
--- xmlcopyeditor-1.1.0.6/src/wrapregex.cpp.gcc43 2008-02-13 22:20:55.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/wrapregex.cpp 2008-02-13 22:21:09.000000000 -0500
|
|
@@ -21,6 +21,7 @@
|
|
#include <string>
|
|
#include <ctype.h>
|
|
#include <stdexcept>
|
|
+#include <cstring>
|
|
#include "wrapregex.h"
|
|
#include "contexthandler.h"
|
|
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xsllocator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xsllocator.h
|
|
--- xmlcopyeditor-1.1.0.6/src/xsllocator.h.gcc43 2008-02-13 23:40:13.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xsllocator.h 2008-02-13 23:40:34.000000000 -0500
|
|
@@ -22,6 +22,7 @@
|
|
|
|
#include <expat.h>
|
|
#include <string>
|
|
+#include <memory>
|
|
#include "wrapexpat.h"
|
|
|
|
struct XslLocatorData : public ParserData
|
|
diff -up xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp
|
|
--- xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp.gcc43 2008-02-13 23:04:33.000000000 -0500
|
|
+++ xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp 2008-02-13 23:04:53.000000000 -0500
|
|
@@ -17,6 +17,7 @@
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
+#include <cstring>
|
|
#include "xmlencodinghandler.h"
|
|
|
|
bool XmlEncodingHandler::hasDeclaration ( const std::string& utf8 )
|