You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ga...@apache.org on 2007/08/21 10:18:04 UTC
svn commit: r568012 - in /xerces/c/branches/xerces-2.7/src/xercesc:
internal/XMLScanner.hpp internal/XSerializeEngine.cpp
util/Compilers/VCPPDefs.hpp
Author: gareth
Date: Tue Aug 21 01:18:04 2007
New Revision: 568012
URL: http://svn.apache.org/viewvc?rev=568012&view=rev
Log:
Apply a patch for 64 bit Windows build. See JIRA issue XERCESC-1531 for details. Thanks to Boris Kolpackov
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/internal/XMLScanner.hpp
xerces/c/branches/xerces-2.7/src/xercesc/internal/XSerializeEngine.cpp
xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/VCPPDefs.hpp
Modified: xerces/c/branches/xerces-2.7/src/xercesc/internal/XMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/internal/XMLScanner.hpp?rev=568012&r1=568011&r2=568012&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/internal/XMLScanner.hpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/internal/XMLScanner.hpp Tue Aug 21 01:18:04 2007
@@ -1298,7 +1298,7 @@
inline void XMLScanner::setInputBufferSize(const size_t bufferSize)
{
fBufferSize = bufferSize;
- fCDataBuf.setFullHandler(this, fBufferSize);
+ fCDataBuf.setFullHandler(this, (unsigned int)fBufferSize);
}
inline void XMLScanner::setIgnoredCachedDTD(const bool newValue)
Modified: xerces/c/branches/xerces-2.7/src/xercesc/internal/XSerializeEngine.cpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/internal/XSerializeEngine.cpp?rev=568012&r1=568011&r2=568012&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/internal/XSerializeEngine.cpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/internal/XSerializeEngine.cpp Tue Aug 21 01:18:04 2007
@@ -902,13 +902,13 @@
***/
TEST_THROW_ARG2( (bytesRead < (int)fBufSize)
, bytesRead
- , fBufSize
+ , (int)fBufSize
, XMLExcepts::XSer_InStream_Read_LT_Req
)
TEST_THROW_ARG2( (bytesRead > (int)fBufSize)
, bytesRead
- , fBufSize
+ , (int)fBufSize
, XMLExcepts::XSer_InStream_Read_OverFlow
)
@@ -1110,20 +1110,20 @@
// Based on the current position (fBufCur), calculated the needed size
// to read/write
//
-inline size_t XSerializeEngine::alignAdjust(size_t size) const
+inline XMLSize_t XSerializeEngine::alignAdjust(XMLSize_t size) const
{
- size_t remainder = (size_t) fBufCur % size;
+ XMLSize_t remainder = (XMLSize_t) fBufCur % size;
return (remainder == 0) ? 0 : (size - remainder);
}
// Adjust the fBufCur
-inline void XSerializeEngine::alignBufCur(size_t size)
+inline void XSerializeEngine::alignBufCur(XMLSize_t size)
{
fBufCur+=alignAdjust(size);
- assert(((size_t) fBufCur % size)==0);
+ assert(((XMLSize_t) fBufCur % size)==0);
}
-inline size_t XSerializeEngine::calBytesNeeded(size_t size) const
+inline XMLSize_t XSerializeEngine::calBytesNeeded(XMLSize_t size) const
{
return (alignAdjust(size) + size);
}
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/VCPPDefs.hpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/VCPPDefs.hpp?rev=568012&r1=568011&r2=568012&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/VCPPDefs.hpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/VCPPDefs.hpp Tue Aug 21 01:18:04 2007
@@ -89,6 +89,11 @@
#define XML_SIZE_MAX SIZE_MAX
typedef ssize_t XMLSSize_t;
#define XML_SSIZE_MAX SSIZE_MAX
+#elif defined(_M_AMD64) || defined(_M_IA64)
+ typedef unsigned __int64 XMLSize_t;
+ #define XML_SIZE_MAX _UI64_MAX
+ typedef __int64 XMLSSize_t;
+ #define XML_SSIZE_MAX _I64_MAX
#else
typedef unsigned long XMLSize_t;
#define XML_SIZE_MAX ULONG_MAX
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org