Author: borisk
Date: Thu Jul 24 01:13:42 2008
New Revision: 679296
URL: http://svn.apache.org/viewvc?rev=679296&view=rev
Log:
Do no assume that XMLSize_t can be read/written as either long or XMLInt64. Use
explicit readSize/writeSize instead.
Modified:
xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.cpp
xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp
xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp
xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp
Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.cpp?rev=679296&r1=679295&r2=679296&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.cpp Thu Jul 24
01:13:42 2008
@@ -173,13 +173,8 @@
serEng<<fNext;
serEng.writeString(fSystemId);
-#if XERCES_SIZEOF_INT != 8 && XERCES_SIZEOF_LONG != 8 && XERCES_SIZEOF_INT64
!= 4
- serEng<<fLine;
- serEng<<fCol;
-#else
- serEng<<(unsigned long)fLine;
- serEng<<(unsigned long)fCol;
-#endif
+ serEng.writeUInt64 (fLine);
+ serEng.writeUInt64 (fCol);
}
else
{
@@ -187,16 +182,8 @@
serEng>>fNext;
serEng.readString(fSystemId);
-#if XERCES_SIZEOF_INT != 8 && XERCES_SIZEOF_LONG != 8 && XERCES_SIZEOF_INT64
!= 4
- serEng>>fLine;
- serEng>>fCol;
-#else
- unsigned long tmp;
- serEng>>tmp;
- fLine = tmp;
- serEng>>tmp;
- fCol = tmp;
-#endif
+ serEng.readUInt64 (fLine);
+ serEng.readUInt64 (fCol);
}
}
Modified: xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp?rev=679296&r1=679295&r2=679296&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp Thu Jul 24
01:13:42 2008
@@ -610,43 +610,53 @@
return *this;
}
-#if XERCES_SIZEOF_INT != 8 && XERCES_SIZEOF_LONG != 8 && XERCES_SIZEOF_INT64
!= 4
-XSerializeEngine& XSerializeEngine::operator<<(XMLInt64 t)
+void XSerializeEngine::writeSize (XMLSize_t t)
{
- checkAndFlushBuffer(sizeof(t));
+ checkAndFlushBuffer(sizeof(t));
- memcpy(fBufCur, &t, sizeof(t));
- fBufCur += sizeof(t);
- return *this;
+ memcpy(fBufCur, &t, sizeof(t));
+ fBufCur += sizeof(t);
}
-XSerializeEngine& XSerializeEngine::operator>>(XMLInt64& t)
+void XSerializeEngine::writeInt64 (XMLInt64 t)
{
- checkAndFillBuffer(sizeof(t));
+ checkAndFlushBuffer(sizeof(t));
- memcpy(&t, fBufCur, sizeof(t));
- fBufCur += sizeof(t);
- return *this;
+ memcpy(fBufCur, &t, sizeof(t));
+ fBufCur += sizeof(t);
}
-XSerializeEngine& XSerializeEngine::operator<<(XMLUInt64 t)
+void XSerializeEngine::writeUInt64 (XMLUInt64 t)
{
- checkAndFlushBuffer(sizeof(t));
+ checkAndFlushBuffer(sizeof(t));
- memcpy(fBufCur, &t, sizeof(t));
- fBufCur += sizeof(t);
- return *this;
+ memcpy(fBufCur, &t, sizeof(t));
+ fBufCur += sizeof(t);
}
-XSerializeEngine& XSerializeEngine::operator>>(XMLUInt64& t)
+void XSerializeEngine::readSize (XMLSize_t& t)
{
- checkAndFillBuffer(sizeof(t));
+ checkAndFillBuffer(sizeof(t));
- memcpy(&t, fBufCur, sizeof(t));
- fBufCur += sizeof(t);
- return *this;
+ memcpy(&t, fBufCur, sizeof(t));
+ fBufCur += sizeof(t);
+}
+
+void XSerializeEngine::readInt64 (XMLInt64& t)
+{
+ checkAndFillBuffer(sizeof(t));
+
+ memcpy(&t, fBufCur, sizeof(t));
+ fBufCur += sizeof(t);
+}
+
+void XSerializeEngine::readUInt64 (XMLUInt64& t)
+{
+ checkAndFillBuffer(sizeof(t));
+
+ memcpy(&t, fBufCur, sizeof(t));
+ fBufCur += sizeof(t);
}
-#endif // XERCES_SIZEOF_INT != 8 && XERCES_SIZEOF_LONG != 8 &&
XERCES_SIZEOF_INT64 != 4
XSerializeEngine& XSerializeEngine::operator<<(char ch)
{
Modified: xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp?rev=679296&r1=679295&r2=679296&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp Thu Jul 24
01:13:42 2008
@@ -487,14 +487,18 @@
XSerializeEngine& operator<<(unsigned int);
XSerializeEngine& operator<<(long);
XSerializeEngine& operator<<(unsigned long);
-#if XERCES_SIZEOF_INT != 8 && XERCES_SIZEOF_LONG != 8 && XERCES_SIZEOF_INT64
!= 4
- XSerializeEngine& operator<<(XMLInt64);
- XSerializeEngine& operator<<(XMLUInt64);
-#endif
XSerializeEngine& operator<<(float);
XSerializeEngine& operator<<(double);
XSerializeEngine& operator<<(bool);
+ // These cannot be done as operators since on some platforms they
+ // may collide with int/long types.
+ //
+ void writeSize (XMLSize_t);
+ void writeInt64 (XMLInt64);
+ void writeUInt64 (XMLUInt64);
+
+
/***
*
* Extraction operators for
@@ -511,14 +515,14 @@
XSerializeEngine& operator>>(unsigned int&);
XSerializeEngine& operator>>(long&);
XSerializeEngine& operator>>(unsigned long&);
-#if XERCES_SIZEOF_INT != 8 && XERCES_SIZEOF_LONG != 8 && XERCES_SIZEOF_INT64
!= 4
- XSerializeEngine& operator>>(XMLInt64&);
- XSerializeEngine& operator>>(XMLUInt64&);
-#endif
XSerializeEngine& operator>>(float&);
XSerializeEngine& operator>>(double&);
XSerializeEngine& operator>>(bool&);
+ void readSize (XMLSize_t&);
+ void readInt64 (XMLInt64&);
+ void readUInt64 (XMLUInt64&);
+
/***
*
* Getters
Modified: xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp?rev=679296&r1=679295&r2=679296&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp Thu Jul 24
01:13:42 2008
@@ -263,7 +263,7 @@
if (serEng.needToStoreObject(objToStore))
{
XMLSize_t vectorSize = objToStore->size();
- serEng<<vectorSize;
+ serEng.writeSize (vectorSize);
for ( XMLSize_t i = 0; i < vectorSize; i++)
{
@@ -296,7 +296,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorSize = 0;
- serEng>>vectorSize;
+ serEng.readSize (vectorSize);
for (XMLSize_t i = 0; i < vectorSize; i++)
{
@@ -313,7 +313,7 @@
if (serEng.needToStoreObject(objToStore))
{
XMLSize_t vectorSize = objToStore->size();
- serEng<<vectorSize;
+ serEng.writeSize (vectorSize);
for (XMLSize_t i = 0; i < vectorSize; i++)
{
@@ -346,7 +346,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorSize = 0;
- serEng>>vectorSize;
+ serEng.readSize (vectorSize);
for (XMLSize_t i = 0; i < vectorSize; i++)
{
@@ -372,7 +372,7 @@
if (serEng.needToStoreObject(objToStore))
{
XMLSize_t vectorSize = objToStore->size();
- serEng<<vectorSize;
+ serEng.writeSize (vectorSize);
for (XMLSize_t i = 0; i < vectorSize; i++)
{
@@ -406,7 +406,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorSize = 0;
- serEng>>vectorSize;
+ serEng.readSize (vectorSize);
for (XMLSize_t i = 0; i < vectorSize; i++)
{
@@ -442,7 +442,7 @@
{
XMLSize_t vectorLength = objToStore->size();
- serEng<<vectorLength;
+ serEng.writeSize (vectorLength);
for ( XMLSize_t i = 0; i < vectorLength; i++)
{
@@ -479,7 +479,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorLength = 0;
- serEng>>vectorLength;
+ serEng.readSize (vectorLength);
for (XMLSize_t i = 0 ; i < vectorLength; i++)
{
SchemaAttDef* data;
@@ -499,7 +499,7 @@
{
XMLSize_t vectorLength = objToStore->size();
- serEng<<vectorLength;
+ serEng.writeSize (vectorLength);
for ( XMLSize_t i = 0; i < vectorLength; i++)
{
@@ -535,7 +535,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorLength = 0;
- serEng>>vectorLength;
+ serEng.readSize (vectorLength);
for (XMLSize_t i = 0 ; i < vectorLength; i++)
{
SchemaElementDecl* data;
@@ -553,7 +553,7 @@
if (serEng.needToStoreObject(objToStore))
{
XMLSize_t vectorLength = objToStore->size();
- serEng<<vectorLength;
+ serEng.writeSize (vectorLength);
for ( XMLSize_t i = 0; i < vectorLength; i++)
{
@@ -588,7 +588,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorLength = 0;
- serEng>>vectorLength;
+ serEng.readSize (vectorLength);
for (XMLSize_t i = 0 ; i < vectorLength; i++)
{
ContentSpecNode* data;
@@ -606,7 +606,7 @@
if (serEng.needToStoreObject(objToStore))
{
XMLSize_t vectorLength = objToStore->size();
- serEng<<vectorLength;
+ serEng.writeSize (vectorLength);
for ( XMLSize_t i = 0; i < vectorLength; i++)
{
@@ -641,7 +641,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorLength = 0;
- serEng>>vectorLength;
+ serEng.readSize (vectorLength);
for (XMLSize_t i = 0 ; i < vectorLength; i++)
{
IC_Field* data;
@@ -659,7 +659,7 @@
if (serEng.needToStoreObject(objToStore))
{
XMLSize_t vectorLength = objToStore->size();
- serEng<<vectorLength;
+ serEng.writeSize (vectorLength);
for ( XMLSize_t i = 0; i < vectorLength; i++)
{
@@ -694,7 +694,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorLength = 0;
- serEng>>vectorLength;
+ serEng.readSize (vectorLength);
for (XMLSize_t i = 0 ; i < vectorLength; i++)
{
DatatypeValidator* data;
@@ -712,7 +712,7 @@
if (serEng.needToStoreObject(objToStore))
{
XMLSize_t vectorLength = objToStore->size();
- serEng<<vectorLength;
+ serEng.writeSize (vectorLength);
for ( XMLSize_t i = 0; i < vectorLength; i++)
{
@@ -747,7 +747,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorLength = 0;
- serEng>>vectorLength;
+ serEng.readSize (vectorLength);
for (XMLSize_t i = 0 ; i < vectorLength; i++)
{
IdentityConstraint* data;
@@ -765,7 +765,7 @@
if (serEng.needToStoreObject(objToStore))
{
XMLSize_t vectorLength = objToStore->size();
- serEng<<vectorLength;
+ serEng.writeSize (vectorLength);
for ( XMLSize_t i = 0; i < vectorLength; i++)
{
@@ -801,7 +801,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorLength = 0;
- serEng>>vectorLength;
+ serEng.readSize (vectorLength);
for (XMLSize_t i = 0 ; i < vectorLength; i++)
{
XMLNumber* data;
@@ -819,7 +819,7 @@
if (serEng.needToStoreObject(objToStore))
{
XMLSize_t vectorLength = objToStore->size();
- serEng<<vectorLength;
+ serEng.writeSize (vectorLength);
for ( XMLSize_t i = 0; i < vectorLength; i++)
{
@@ -854,7 +854,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorLength = 0;
- serEng>>vectorLength;
+ serEng.readSize (vectorLength);
for (XMLSize_t i = 0 ; i < vectorLength; i++)
{
XercesLocationPath* data;
@@ -872,7 +872,7 @@
if (serEng.needToStoreObject(objToStore))
{
XMLSize_t vectorLength = objToStore->size();
- serEng<<vectorLength;
+ serEng.writeSize (vectorLength);
for (XMLSize_t i = 0; i < vectorLength; i++)
{
@@ -907,7 +907,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t vectorLength = 0;
- serEng>>vectorLength;
+ serEng.readSize (vectorLength);
for (XMLSize_t i = 0 ; i < vectorLength; i++)
{
XercesStep* data;
@@ -940,7 +940,7 @@
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHashTableOfEnumerator<KVStringPair> e(objToStore, false,
objToStore->getMemoryManager());
XMLSize_t itemNumber = 0;
@@ -951,7 +951,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -985,7 +985,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1000,7 +1000,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -1017,7 +1017,7 @@
{
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHashTableOfEnumerator<XMLAttDef> e(objToStore, false,
objToStore->getMemoryManager());
XMLSize_t itemNumber = 0;
@@ -1028,7 +1028,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -1063,7 +1063,7 @@
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1078,7 +1078,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -1100,7 +1100,7 @@
{
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHashTableOfEnumerator<DTDAttDef> e(objToStore, false,
objToStore->getMemoryManager());
XMLSize_t itemNumber = 0;
@@ -1111,7 +1111,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -1146,7 +1146,7 @@
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1161,7 +1161,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -1178,7 +1178,7 @@
{
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHashTableOfEnumerator<ComplexTypeInfo> e(objToStore, false,
objToStore->getMemoryManager());
XMLSize_t itemNumber = 0;
@@ -1189,7 +1189,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -1222,7 +1222,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1237,7 +1237,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -1254,7 +1254,7 @@
{
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHashTableOfEnumerator<XercesGroupInfo> e(objToStore, false,
objToStore->getMemoryManager());
XMLSize_t itemNumber = 0;
@@ -1265,7 +1265,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -1319,7 +1319,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1334,7 +1334,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -1357,8 +1357,7 @@
if (serEng.needToStoreObject(objToStore))
{
-
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHashTableOfEnumerator<XercesAttGroupInfo> e(objToStore, false,
objToStore->getMemoryManager());
XMLSize_t itemNumber = 0;
@@ -1369,7 +1368,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -1402,7 +1401,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1417,7 +1416,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -1435,7 +1434,7 @@
{
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHashTableOfEnumerator<XMLRefInfo> e(objToStore, false,
objToStore->getMemoryManager());
XMLSize_t itemNumber = 0;
@@ -1446,7 +1445,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -1484,7 +1483,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1499,7 +1498,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -1521,7 +1520,7 @@
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHashTableOfEnumerator<DatatypeValidator> e(objToStore, false,
objToStore->getMemoryManager());
XMLSize_t itemNumber = 0;
@@ -1532,7 +1531,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -1573,7 +1572,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1588,7 +1587,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -1631,7 +1630,7 @@
{
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHashTableOfEnumerator<Grammar> e(objToStore, false,
objToStore->getMemoryManager());
XMLSize_t itemNumber = 0;
@@ -1642,7 +1641,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -1676,7 +1675,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1691,7 +1690,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -1710,7 +1709,7 @@
{
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHashTableOfEnumerator<XSAnnotation, PtrHasher> e(objToStore, false,
objToStore->getMemoryManager());
@@ -1726,7 +1725,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
//to sort the key
@@ -1777,7 +1776,7 @@
}
XMLSize_t itemNumber = ids.size();
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
for (XMLSize_t i=0; i<itemNumber; i++)
{
@@ -1798,7 +1797,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1813,7 +1812,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
XMLSize_t itemIndex;
XSerializeEngine::XSerializedObjectId_t keyId;
@@ -1853,7 +1852,7 @@
{
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
XMLSize_t itemNumber = 0;
@@ -1865,7 +1864,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -1906,7 +1905,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -1921,7 +1920,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -1944,7 +1943,7 @@
{
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
XMLSize_t itemNumber = 0;
@@ -1956,7 +1955,7 @@
itemNumber++;
}
- serEng<<itemNumber;
+ serEng.writeSize (itemNumber);
e.Reset();
#ifdef XERCES_DEBUG_SORT_GRAMMAR
@@ -2003,7 +2002,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -2018,7 +2017,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
for (XMLSize_t itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -2087,11 +2086,11 @@
{
if (serEng.needToStoreObject(objToStore))
{
- serEng<<objToStore->getHashModulus();
+ serEng.writeSize (objToStore->getHashModulus());
RefHash3KeysIdPoolEnumerator<SchemaElementDecl> e(objToStore, false,
objToStore->getMemoryManager());
- serEng<<e.size();
+ serEng.writeSize (e.size());
void* strkey;
int key1;
@@ -2118,7 +2117,7 @@
if (serEng.needToLoadObject((void**)objToLoad))
{
XMLSize_t hashModulus;
- serEng>>hashModulus;
+ serEng.readSize (hashModulus);
if (!*objToLoad)
{
@@ -2133,7 +2132,7 @@
serEng.registerObject(*objToLoad);
XMLSize_t itemNumber = 0;
- serEng>>itemNumber;
+ serEng.readSize (itemNumber);
int scopeKey;
SchemaElementDecl* elemDecl;
@@ -2204,7 +2203,7 @@
serEng.registerObject(*objToLoad);
unsigned int itemNumber = 0;
- serEng>>itemNumber;
+ serEng >> itemNumber;
for (unsigned int itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -2256,7 +2255,7 @@
serEng.registerObject(*objToLoad);
unsigned int itemNumber = 0;
- serEng>>itemNumber;
+ serEng >> itemNumber;
for (unsigned int itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
@@ -2309,7 +2308,7 @@
serEng.registerObject(*objToLoad);
unsigned int itemNumber = 0;
- serEng>>itemNumber;
+ serEng >> itemNumber;
for (unsigned int itemIndex = 0; itemIndex < itemNumber; itemIndex++)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
