dbertoni 01/09/25 14:12:29
Modified: c/src/DOMSupport DOMServices.cpp DOMServices.hpp
NamespaceResolver.cpp
Log:
32/64-bit fixes.
Revision Changes Path
1.33 +21 -21 xml-xalan/c/src/DOMSupport/DOMServices.cpp
Index: DOMServices.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMServices.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- DOMServices.cpp 2001/09/14 20:02:18 1.32
+++ DOMServices.cpp 2001/09/25 21:12:28 1.33
@@ -112,22 +112,22 @@
// These four unsigned ints will hold the actual
// data. This way, the DOMSupport references can be const,
// but we can initialize the data when we want to.
-static unsigned int s_XMLStringLength = 0;
-static unsigned int s_XMLStringWithSeparatorLength = 0;
-static unsigned int s_XMLNamespaceURILength = 0;
-static unsigned int s_XMLNamespaceLength = 0;
-static unsigned int s_XMLNamespaceWithSeparatorLength = 0;
-static unsigned int s_XMLNamespaceSeparatorStringLength = 0;
-static unsigned int s_XMLNamespacePrefixURILength = 0;
+static XalanDOMString::size_type s_XMLStringLength = 0;
+static XalanDOMString::size_type s_XMLStringWithSeparatorLength = 0;
+static XalanDOMString::size_type s_XMLNamespaceURILength = 0;
+static XalanDOMString::size_type s_XMLNamespaceLength = 0;
+static XalanDOMString::size_type s_XMLNamespaceWithSeparatorLength = 0;
+static XalanDOMString::size_type s_XMLNamespaceSeparatorStringLength = 0;
+static XalanDOMString::size_type s_XMLNamespacePrefixURILength = 0;
-const unsigned int& DOMServices::s_XMLStringLength =
::s_XMLStringLength;
-const unsigned int& DOMServices::s_XMLStringWithSeparatorLength =
::s_XMLStringWithSeparatorLength;
-const unsigned int& DOMServices::s_XMLNamespaceURILength =
::s_XMLNamespaceURILength;
-const unsigned int& DOMServices::s_XMLNamespaceLength =
::s_XMLNamespaceLength;
-const unsigned int& DOMServices::s_XMLNamespaceWithSeparatorLength
= ::s_XMLNamespaceWithSeparatorLength;
-const unsigned int&
DOMServices::s_XMLNamespaceSeparatorStringLength =
::s_XMLNamespaceSeparatorStringLength;
+const XalanDOMString::size_type& DOMServices::s_XMLStringLength =
::s_XMLStringLength;
+const XalanDOMString::size_type&
DOMServices::s_XMLStringWithSeparatorLength = ::s_XMLStringWithSeparatorLength;
+const XalanDOMString::size_type& DOMServices::s_XMLNamespaceURILength =
::s_XMLNamespaceURILength;
+const XalanDOMString::size_type& DOMServices::s_XMLNamespaceLength =
::s_XMLNamespaceLength;
+const XalanDOMString::size_type&
DOMServices::s_XMLNamespaceWithSeparatorLength =
::s_XMLNamespaceWithSeparatorLength;
+const XalanDOMString::size_type&
DOMServices::s_XMLNamespaceSeparatorStringLength =
::s_XMLNamespaceSeparatorStringLength;
@@ -158,11 +158,11 @@
bool
DOMServices::WhitespaceSupportDefault::isIgnorableWhitespace(const
XalanText& node) const
{
- const XalanDOMString theData(node.getData());
+ const XalanDOMString theData(node.getData());
- const unsigned int theLength = length(theData);
+ const XalanDOMString::size_type theLength = length(theData);
- unsigned int i = 0;
+ XalanDOMString::size_type i = 0;
for (; i < theLength; i++)
{
@@ -778,7 +778,7 @@
const XalanDOMString& aname =
attr->getNodeName();
- const unsigned int len =
length(aname);
+ const XalanDOMString::size_type
len = length(aname);
const bool isPrefix = len <=
s_XMLNamespaceWithSeparatorLength ? false :
equals(substring(aname,
@@ -789,11 +789,11 @@
if (equals(aname, s_XMLNamespace) ||
isPrefix)
{
// slightly inefficient for
default decl.
- const unsigned int index =
indexOf(aname,
-
XalanUnicode::charColon);
+ const XalanDOMString::size_type
index =
+ indexOf(aname,
XalanUnicode::charColon);
- const XalanDOMString p =
(isPrefix)
- ? substring(aname,index
+ 1,len)
+ const XalanDOMString p =
isPrefix ?
+ substring(aname,index +
1,len)
: XalanDOMString();
if (equals(p, prefix) == true)
1.26 +10 -8 xml-xalan/c/src/DOMSupport/DOMServices.hpp
Index: DOMServices.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMServices.hpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DOMServices.hpp 2001/08/06 02:15:03 1.25
+++ DOMServices.hpp 2001/09/25 21:12:28 1.26
@@ -96,13 +96,13 @@
static const XalanDOMString& s_XMLNamespaceSeparatorString;
static const XalanDOMString& s_XMLNamespacePrefixURI;
- static const unsigned int& s_XMLStringLength;
- static const unsigned int& s_XMLStringWithSeparatorLength;
- static const unsigned int& s_XMLNamespaceURILength;
- static const unsigned int& s_XMLNamespaceLength;
- static const unsigned int&
s_XMLNamespaceWithSeparatorLength;
- static const unsigned int&
s_XMLNamespaceSeparatorStringLength;
- static const unsigned int& s_XMLNamespacePrefixURILength;
+ static const XalanDOMString::size_type& s_XMLStringLength;
+ static const XalanDOMString::size_type&
s_XMLStringWithSeparatorLength;
+ static const XalanDOMString::size_type& s_XMLNamespaceURILength;
+ static const XalanDOMString::size_type& s_XMLNamespaceLength;
+ static const XalanDOMString::size_type&
s_XMLNamespaceWithSeparatorLength;
+ static const XalanDOMString::size_type&
s_XMLNamespaceSeparatorStringLength;
+ static const XalanDOMString::size_type&
s_XMLNamespacePrefixURILength;
// A dummy string to return when we need an emtpy string...
@@ -683,7 +683,9 @@
MemberFunctionPtr function,
const XalanDOMString& data)
{
- (formatterListener.*function)(c_wstr(data), length(data));
+ assert(length(data) ==
FormatterListener::size_type(length(data)));
+
+ (formatterListener.*function)(c_wstr(data),
FormatterListener::size_type(length(data)));
}
};
1.13 +4 -3 xml-xalan/c/src/DOMSupport/NamespaceResolver.cpp
Index: NamespaceResolver.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/NamespaceResolver.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- NamespaceResolver.cpp 2000/11/02 01:45:29 1.12
+++ NamespaceResolver.cpp 2001/09/25 21:12:28 1.13
@@ -177,9 +177,9 @@
}
else
{
- const XalanDOMString& nodeName = theLocalNode->getNodeName();
+ const XalanDOMString& nodeName =
theLocalNode->getNodeName();
- unsigned int indexOfNSSep =
indexOf(nodeName, XalanUnicode::charColon);
+ XalanDOMString::size_type indexOfNSSep =
indexOf(nodeName, XalanUnicode::charColon);
XalanDOMString prefix;
@@ -338,7 +338,8 @@
}
// Anotation pass over the "any other node" queue
- const unsigned int nCandidates =
candidateNoAncestorXMLNS.size();
+ const CandidateNoAncestorVectorType::size_type
nCandidates =
+ candidateNoAncestorXMLNS.size();
if(nCandidates > 0)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
