neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed problem when compiling with GCC 4.7

This commit is contained in:
Zane U. Ji 2012-08-13 21:22:22 +08:00
parent 937d031ae9
commit 3caf99e454
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wrapxerces.cpp
View File

@ -18,7 +18,6 @@
*/ */
#include "wrapxerces.h" #include "wrapxerces.h"
#define XERCES_TMPLSINC
#include <xercesc/sax2/XMLReaderFactory.hpp> #include <xercesc/sax2/XMLReaderFactory.hpp>
#include <xercesc/sax2/SAX2XMLReader.hpp> #include <xercesc/sax2/SAX2XMLReader.hpp>

3
src/wrapxerces.h
View File

@ -19,7 +19,10 @@
#ifndef WRAP_XERCES #ifndef WRAP_XERCES
#define WRAP_XERCES #define WRAP_XERCES
#if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
#define XERCES_TMPLSINC #define XERCES_TMPLSINC
#endif
#include <wx/wx.h> #include <wx/wx.h>
#include <string> #include <string>

5
src/xmlpromptgenerator.cpp
View File

@ -30,9 +30,7 @@
#include "catalogresolver.h" #include "catalogresolver.h"
// Xerces-C req'd for Schema parsing // Xerces-C req'd for Schema parsing
#ifdef __WXMSW__ #include "wrapxerces.h" // Declaration of toString() and XERCES_TMPLSINC definition
#define XERCES_TMPLSINC
#endif
#include <xercesc/util/NameIdPool.hpp> #include <xercesc/util/NameIdPool.hpp>
#include <xercesc/util/PlatformUtils.hpp> #include <xercesc/util/PlatformUtils.hpp>
@ -42,7 +40,6 @@
#include <xercesc/validators/schema/SchemaValidator.hpp> #include <xercesc/validators/schema/SchemaValidator.hpp>
#include <xercesc/validators/common/ContentSpecNode.hpp> #include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp> #include <xercesc/validators/schema/SchemaSymbols.hpp>
#include "wrapxerces.h" // Delearation of toString()
using namespace xercesc; using namespace xercesc;