• R/O
  • SSH
  • HTTPS

xerces-c-utils: Commit


Commit MetaInfo

Revisión11 (tree)
Tiempo2011-04-24 17:44:22
Autor(del#42492)

Log Message

Xerces-C++ 2.2.0 ~ 3.1.1 までをテストして、バージョンの差を吸収した。

Cambiar Resumen

Diferencia incremental

--- trunk/main/include/xercesc_utils/Char2XMLChTranscoder.hpp (revision 10)
+++ trunk/main/include/xercesc_utils/Char2XMLChTranscoder.hpp (revision 11)
@@ -46,10 +46,13 @@
4646 */
4747 explicit Char2XMLChTranscoder(const char* encoding, int bufferSize = 1024) :
4848 bufferSize_(bufferSize), buffer_(new XMLCh[bufferSize+4]), charSizes_(new unsigned char[bufferSize]) {
49- xercesc::XMLTransService::Codes failReason;
49+ xercesc::XMLTransService::Codes failReason;
5050 transcoder_ = xercesc::XMLPlatformUtils::fgTransService->makeNewTranscoderFor(
51- encoding, failReason, bufferSize_, xercesc::XMLPlatformUtils::fgMemoryManager
52- );
51+ encoding, failReason, bufferSize_
52+#if _XERCES_VERSION == 20300
53+ , XMLPlatformUtils::fgMemoryManager
54+#endif
55+ );
5356 }
5457
5558 /**
@@ -73,8 +76,12 @@
7376 const unsigned int count = xercesc::XMLString::stringLen(toTranscode);
7477 const XMLByte* srcPtr = (XMLByte*) toTranscode;
7578 const XMLByte* endPtr = (XMLByte*) toTranscode+count;
76- XMLSize_t charsEaten;
77- XMLChPtr result;
79+#if XERCES_VERSION_MAJOR >= 3
80+ XMLSize_t charsEaten;
81+#else
82+ unsigned int charsEaten;
83+#endif
84+ XMLChPtr result;
7885
7986 while (srcPtr < endPtr) {
8087 const unsigned int srcCount = endPtr-srcPtr;
--- trunk/main/include/xercesc_utils/XMLCh2CharTranscoder.hpp (revision 10)
+++ trunk/main/include/xercesc_utils/XMLCh2CharTranscoder.hpp (revision 11)
@@ -47,8 +47,11 @@
4747 bufferSize_(bufferSize), buffer_(new XMLByte[bufferSize + 4]) {
4848 xercesc::XMLTransService::Codes failReason;
4949 transcoder_ = xercesc::XMLPlatformUtils::fgTransService->makeNewTranscoderFor(
50- encoding, failReason, bufferSize_, xercesc::XMLPlatformUtils::fgMemoryManager
51- );
50+ encoding, failReason, bufferSize_
51+#if _XERCES_VERSION == 20300
52+ , XMLPlatformUtils::fgMemoryManager
53+#endif
54+ );
5255 }
5356
5457 /**
@@ -73,8 +76,12 @@
7376 const unsigned int count = xercesc::XMLString::stringLen(toTranscode);
7477 const XMLCh* srcPtr = toTranscode;
7578 const XMLCh* endPtr = toTranscode+count;
76- XMLSize_t charsEaten;
77- CharPtr result;
79+#if XERCES_VERSION_MAJOR >= 3
80+ XMLSize_t charsEaten;
81+#else
82+ unsigned int charsEaten;
83+#endif
84+ CharPtr result;
7885
7986 while (srcPtr < endPtr) {
8087 const unsigned int srcCount = endPtr - srcPtr;
Show on old repository browser