Updates for Xerces-3 and boost 1.38

rafalrusin · Feb 8, 2010 · 6894c29 · 6894c29
1 parent 047fa09
commit 6894c29
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/cbootstrap b/cbootstrap
@@ -1,6 +1,6 @@
 rm -rf build
 mkdir build
 cd build
-#cmake .. -DWITHOUT_GMP=1
+cmake .. -DWITHOUT_GMP=1
 
-cmake ..
+#cmake ..
diff --git a/cmake/FindBoost.cmake b/cmake/FindBoost.cmake
@@ -190,7 +190,7 @@ else (BOOST_LIBRARIES AND BOOST_INCLUDE_DIRS)
 #message(STATUS "trying paths ${BOOST_LIBRARIES_SEARCH_DIRS}")
 
 
-  foreach (TMP_BOOST_LIBRARIES_SUFFIX "" ${BOOST_LIBRARIES_SUFFIXES})
+  foreach (TMP_BOOST_LIBRARIES_SUFFIX "" "-mt" ${BOOST_LIBRARIES_SUFFIXES})
 #	message(STATUS "trying  boost_date_time${TMP_BOOST_LIBRARIES_SUFFIX}")
 
     if (NOT BOOST_DATE_TIME_LIBRARY)

diff --git a/examples/geoip/cmake/FindBoost.cmake b/examples/geoip/cmake/FindBoost.cmake
@@ -190,7 +190,7 @@ else (BOOST_LIBRARIES AND BOOST_INCLUDE_DIRS)
 #message(STATUS "trying paths ${BOOST_LIBRARIES_SEARCH_DIRS}")
 
 
-  foreach (TMP_BOOST_LIBRARIES_SUFFIX "" ${BOOST_LIBRARIES_SUFFIXES})
+  foreach (TMP_BOOST_LIBRARIES_SUFFIX "" "-mt" ${BOOST_LIBRARIES_SUFFIXES})
 #	message(STATUS "trying  boost_date_time${TMP_BOOST_LIBRARIES_SUFFIX}")
 
     if (NOT BOOST_DATE_TIME_LIBRARY)

diff --git a/src/xmlbeansxx/XercesParser.cpp b/src/xmlbeansxx/XercesParser.cpp
@@ -31,7 +31,7 @@
 #include <set>
 
 #include <xercesc/framework/XMLGrammarPool.hpp>
-#include <xercesc/internal/XMLGrammarPoolImpl.hpp>
+//#include <xercesc/internal/XMLGrammarPoolImpl.hpp>
 #include <xercesc/util/XMLUni.hpp>
 #include <xercesc/sax2/XMLReaderFactory.hpp>
 #include "ContentsImpl.h"

diff --git a/src/xmlbeansxx/XercesUtils.h b/src/xmlbeansxx/XercesUtils.h
@@ -37,6 +37,8 @@ namespace xmlbeansxx {
 
 
 #if (XERCES_VERSION_MAJOR == 3)
+#include <xercesc/util/XMLUni.hpp>
+
 // for xerces 3.0
 /** Provides a xerces input stream to read from std::istream */
 class BinStdInputStream: public xercesc::BinInputStream {
@@ -46,6 +48,7 @@ class BinStdInputStream: public xercesc::BinInputStream {
     BinStdInputStream(std::istream &in);
     XMLFilePos curPos() const;
     XMLSize_t readBytes(XMLByte *const toFill,const XMLSize_t  maxToRead);
+    virtual const XMLCh* getContentType() const { return XERCES_CPP_NAMESPACE::XMLUni::fgUTF8EncodingString; }
 };
 
 /** Provides a xerces XMLFormatTarget that writes to String. */