dbertoni 01/09/25 14:14:05
Modified: c/src/XercesParserLiaison XercesBridgeHelper.hpp
XercesLiaisonXalanDOMStringPool.cpp
XercesLiaisonXalanDOMStringPool.hpp
XercesNamedNodeListCache.cpp
Log:
32/64-bit fixes.
Revision Changes Path
1.3 +5 -1
xml-xalan/c/src/XercesParserLiaison/XercesBridgeHelper.hpp
Index: XercesBridgeHelper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeHelper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesBridgeHelper.hpp 2001/01/08 18:23:01 1.2
+++ XercesBridgeHelper.hpp 2001/09/25 21:14:05 1.3
@@ -87,10 +87,14 @@
{
public:
+ typedef unsigned int XercesStringLengthType;
+
static const DOMString
XalanDOMStringToXercesDOMString(const XalanDOMString& theString)
{
- return DOMString(&theString[0], theString.length());
+ assert(XercesStringLengthType(theString.length()) ==
theString.length());
+
+ return DOMString(&theString[0],
XercesStringLengthType(theString.length()));
}
static void
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.cpp
Index: XercesLiaisonXalanDOMStringPool.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesLiaisonXalanDOMStringPool.cpp 2001/05/10 17:53:29 1.2
+++ XercesLiaisonXalanDOMStringPool.cpp 2001/09/25 21:14:05 1.3
@@ -84,7 +84,7 @@
-unsigned int
+size_t
XercesLiaisonXalanDOMStringPool::size() const
{
#if defined(XALAN_NO_MUTABLE)
1.3 +1 -3
xml-xalan/c/src/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.hpp
Index: XercesLiaisonXalanDOMStringPool.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesLiaisonXalanDOMStringPool.hpp 2001/05/10 17:53:31 1.2
+++ XercesLiaisonXalanDOMStringPool.hpp 2001/09/25 21:14:05 1.3
@@ -79,7 +79,6 @@
typedef XalanDOMStringPool BaseClassType;
-
explicit
XercesLiaisonXalanDOMStringPool();
@@ -91,7 +90,7 @@
virtual void
clear();
- virtual unsigned int
+ virtual size_t
size() const;
virtual const XalanDOMString&
@@ -112,7 +111,6 @@
bool
operator==(const XercesLiaisonXalanDOMStringPool&) const;
-
// Data members...
mutable XMLMutex m_mutex;
1.6 +2 -2
xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeListCache.cpp
Index: XercesNamedNodeListCache.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeListCache.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesNamedNodeListCache.cpp 2001/04/30 18:09:02 1.5
+++ XercesNamedNodeListCache.cpp 2001/09/25 21:14:05 1.6
@@ -137,8 +137,8 @@
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const
{
- const unsigned int theNamespaceURILength = length(namespaceURI);
- const unsigned int theLocalNameLength = length(localName);
+ const XalanDOMString::size_type theNamespaceURILength =
length(namespaceURI);
+ const XalanDOMString::size_type theLocalNameLength =
length(localName);
XalanDOMString theSearchString;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
