You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by db...@apache.org on 2007/12/27 19:15:25 UTC
svn commit: r607104 - in /xerces/c/trunk: samples/src/MemParse/
samples/src/PParse/ samples/src/Redirect/ samples/src/SAX2Count/
samples/src/SAXCount/ samples/src/StdInParse/ tests/src/ThreadTest/
tests/src/XSerializerTest/
Author: dbertoni
Date: Thu Dec 27 10:15:24 2007
New Revision: 607104
URL: http://svn.apache.org/viewvc?rev=607104&view=rev
Log:
Fixed 64-bit/32-bit mismatches.
Modified:
xerces/c/trunk/samples/src/MemParse/MemParseHandlers.hpp
xerces/c/trunk/samples/src/PParse/PParseHandlers.hpp
xerces/c/trunk/samples/src/Redirect/RedirectHandlers.hpp
xerces/c/trunk/samples/src/SAX2Count/SAX2CountHandlers.hpp
xerces/c/trunk/samples/src/SAXCount/SAXCountHandlers.hpp
xerces/c/trunk/samples/src/StdInParse/StdInParseHandlers.hpp
xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp
xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.hpp
Modified: xerces/c/trunk/samples/src/MemParse/MemParseHandlers.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/MemParse/MemParseHandlers.hpp?rev=607104&r1=607103&r2=607104&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/MemParse/MemParseHandlers.hpp (original)
+++ xerces/c/trunk/samples/src/MemParse/MemParseHandlers.hpp Thu Dec 27 10:15:24 2007
@@ -55,12 +55,12 @@
return fAttrCount;
}
- unsigned int getCharacterCount()
+ XMLSize_t getCharacterCount()
{
return fCharacterCount;
}
- unsigned int getSpaceCount()
+ XMLSize_t getSpaceCount()
{
return fSpaceCount;
}
@@ -96,7 +96,7 @@
// from the document handlers.
// -----------------------------------------------------------------------
unsigned int fAttrCount;
- unsigned int fCharacterCount;
+ XMLSize_t fCharacterCount;
unsigned int fElementCount;
- unsigned int fSpaceCount;
+ XMLSize_t fSpaceCount;
};
Modified: xerces/c/trunk/samples/src/PParse/PParseHandlers.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/PParse/PParseHandlers.hpp?rev=607104&r1=607103&r2=607104&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/PParse/PParseHandlers.hpp (original)
+++ xerces/c/trunk/samples/src/PParse/PParseHandlers.hpp Thu Dec 27 10:15:24 2007
@@ -46,7 +46,7 @@
return fAttrCount;
}
- unsigned int getCharacterCount() const
+ XMLSize_t getCharacterCount() const
{
return fCharacterCount;
}
@@ -56,7 +56,7 @@
return fSawErrors;
}
- unsigned int getSpaceCount() const
+ XMLSize_t getSpaceCount() const
{
return fSpaceCount;
}
@@ -95,9 +95,9 @@
// see if any errors occured.
// -----------------------------------------------------------------------
unsigned int fAttrCount;
- unsigned int fCharacterCount;
+ XMLSize_t fCharacterCount;
unsigned int fElementCount;
- unsigned int fSpaceCount;
+ XMLSize_t fSpaceCount;
bool fSawErrors;
};
Modified: xerces/c/trunk/samples/src/Redirect/RedirectHandlers.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/Redirect/RedirectHandlers.hpp?rev=607104&r1=607103&r2=607104&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/Redirect/RedirectHandlers.hpp (original)
+++ xerces/c/trunk/samples/src/Redirect/RedirectHandlers.hpp Thu Dec 27 10:15:24 2007
@@ -56,12 +56,12 @@
return fAttrCount;
}
- unsigned int getCharacterCount()
+ XMLSize_t getCharacterCount()
{
return fCharacterCount;
}
- unsigned int getSpaceCount()
+ XMLSize_t getSpaceCount()
{
return fSpaceCount;
}
@@ -115,7 +115,7 @@
// from the document handlers.
// -----------------------------------------------------------------------
unsigned int fAttrCount;
- unsigned int fCharacterCount;
+ XMLSize_t fCharacterCount;
unsigned int fElementCount;
- unsigned int fSpaceCount;
+ XMLSize_t fSpaceCount;
};
Modified: xerces/c/trunk/samples/src/SAX2Count/SAX2CountHandlers.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/SAX2Count/SAX2CountHandlers.hpp?rev=607104&r1=607103&r2=607104&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/SAX2Count/SAX2CountHandlers.hpp (original)
+++ xerces/c/trunk/samples/src/SAX2Count/SAX2CountHandlers.hpp Thu Dec 27 10:15:24 2007
@@ -51,7 +51,7 @@
return fAttrCount;
}
- unsigned int getCharacterCount() const
+ XMLSize_t getCharacterCount() const
{
return fCharacterCount;
}
@@ -61,7 +61,7 @@
return fSawErrors;
}
- unsigned int getSpaceCount() const
+ XMLSize_t getSpaceCount() const
{
return fSpaceCount;
}
@@ -101,8 +101,8 @@
// see if any errors occured.
// -----------------------------------------------------------------------
unsigned int fAttrCount;
- unsigned int fCharacterCount;
+ XMLSize_t fCharacterCount;
unsigned int fElementCount;
- unsigned int fSpaceCount;
+ XMLSize_t fSpaceCount;
bool fSawErrors;
};
Modified: xerces/c/trunk/samples/src/SAXCount/SAXCountHandlers.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/SAXCount/SAXCountHandlers.hpp?rev=607104&r1=607103&r2=607104&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/SAXCount/SAXCountHandlers.hpp (original)
+++ xerces/c/trunk/samples/src/SAXCount/SAXCountHandlers.hpp Thu Dec 27 10:15:24 2007
@@ -54,7 +54,7 @@
return fAttrCount;
}
- unsigned int getCharacterCount() const
+ XMLSize_t getCharacterCount() const
{
return fCharacterCount;
}
@@ -64,7 +64,7 @@
return fSawErrors;
}
- unsigned int getSpaceCount() const
+ XMLSize_t getSpaceCount() const
{
return fSpaceCount;
}
@@ -104,8 +104,8 @@
// see if any errors occured.
// -----------------------------------------------------------------------
unsigned int fAttrCount;
- unsigned int fCharacterCount;
+ XMLSize_t fCharacterCount;
unsigned int fElementCount;
- unsigned int fSpaceCount;
+ XMLSize_t fSpaceCount;
bool fSawErrors;
};
Modified: xerces/c/trunk/samples/src/StdInParse/StdInParseHandlers.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/StdInParse/StdInParseHandlers.hpp?rev=607104&r1=607103&r2=607104&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/StdInParse/StdInParseHandlers.hpp (original)
+++ xerces/c/trunk/samples/src/StdInParse/StdInParseHandlers.hpp Thu Dec 27 10:15:24 2007
@@ -54,12 +54,12 @@
return fAttrCount;
}
- unsigned int getCharacterCount()
+ XMLSize_t getCharacterCount()
{
return fCharacterCount;
}
- unsigned int getSpaceCount()
+ XMLSize_t getSpaceCount()
{
return fSpaceCount;
}
@@ -95,7 +95,7 @@
// from the document handlers.
// -----------------------------------------------------------------------
unsigned int fAttrCount;
- unsigned int fCharacterCount;
+ XMLSize_t fCharacterCount;
unsigned int fElementCount;
- unsigned int fSpaceCount;
+ XMLSize_t fSpaceCount;
};
Modified: xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp?rev=607104&r1=607103&r2=607104&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp (original)
+++ xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp Thu Dec 27 10:15:24 2007
@@ -345,7 +345,7 @@
void domPrint(); // including any children. Default (no param)
// version dumps the entire document.
- void addToCheckSum(const XMLCh *chars, int len=-1);
+ void addToCheckSum(const XMLCh *chars, XMLSize_t len=(XMLSize_t)-1);
// These are the SAX call-back functions that this class implements. Can be used
// for SAX and SAX2.
@@ -627,9 +627,9 @@
// will then default to -1), or provide an explicit
// length.
//
-void ThreadParser::addToCheckSum(const XMLCh *chars, int len)
+void ThreadParser::addToCheckSum(const XMLCh *chars, XMLSize_t len)
{
- if (len == -1)
+ if (len == (XMLSize_t)-1)
{
// Null terminated string.
while (*chars != 0)
@@ -641,7 +641,7 @@
else
{
// String with character count.
- int i;
+ XMLSize_t i;
for (i=0; i<len; i++)
fCheckSum = fCheckSum*5 + chars[i];
}
Modified: xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.hpp?rev=607104&r1=607103&r2=607104&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.hpp (original)
+++ xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.hpp Thu Dec 27 10:15:24 2007
@@ -53,7 +53,7 @@
return fAttrCount;
}
- unsigned int getCharacterCount() const
+ XMLSize_t getCharacterCount() const
{
return fCharacterCount;
}
@@ -63,7 +63,7 @@
return fSawErrors;
}
- unsigned int getSpaceCount() const
+ XMLSize_t getSpaceCount() const
{
return fSpaceCount;
}
@@ -103,9 +103,9 @@
// see if any errors occured.
// -----------------------------------------------------------------------
unsigned int fAttrCount;
- unsigned int fCharacterCount;
+ XMLSize_t fCharacterCount;
unsigned int fElementCount;
- unsigned int fSpaceCount;
+ XMLSize_t fSpaceCount;
bool fSawErrors;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org