dbertoni 01/09/26 13:58:47
Modified: c/src/XPath FunctionConcat.cpp FunctionContains.cpp
FunctionID.cpp FunctionLang.cpp FunctionLast.cpp
FunctionNormalizeSpace.cpp FunctionPosition.cpp
FunctionSubstring.cpp FunctionSubstringAfter.cpp
FunctionSubstringBefore.cpp FunctionSum.cpp
FunctionTranslate.cpp MutableNodeRefList.cpp
MutableNodeRefList.hpp NodeRefList.cpp
NodeRefList.hpp NodeRefListBase.hpp
NodeRefListResultTreeFragProxy.cpp
ResultTreeFrag.cpp SimpleNodeLocator.cpp
XBoolean.cpp XNodeSet.hpp XNodeSetBase.cpp
XNodeSetBase.hpp XNodeSetResultTreeFragProxy.cpp
XNumber.cpp XObject.cpp XPathExecutionContext.hpp
XPathExecutionContextDefault.cpp
XPathExecutionContextDefault.hpp
XPathExpression.hpp XResultTreeFrag.cpp XString.cpp
XStringCached.cpp XStringReference.cpp XToken.cpp
XUnknown.cpp XalanQName.cpp XalanQNameByValue.cpp
Log:
32/64-bit fixes.
Revision Changes Path
1.12 +1 -1 xml-xalan/c/src/XPath/FunctionConcat.cpp
Index: FunctionConcat.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionConcat.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionConcat.cpp 2001/09/20 18:05:34 1.11
+++ FunctionConcat.cpp 2001/09/26 20:58:46 1.12
@@ -138,7 +138,7 @@
const XObjectArgVectorType& args,
const Locator* /*
locator */) const
{
- unsigned int theCombinedLength = 0;
+ XalanDOMString::size_type theCombinedLength = 0;
const XObjectArgVectorType::const_iterator theEnd = args.end();
1.8 +1 -1 xml-xalan/c/src/XPath/FunctionContains.cpp
Index: FunctionContains.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionContains.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionContains.cpp 2001/09/20 18:05:34 1.7
+++ FunctionContains.cpp 2001/09/26 20:58:46 1.8
@@ -101,7 +101,7 @@
{
// OK, both strings have some data, so look for
// the index...
- const unsigned int theIndex =
indexOf(str1, str2);
+ const XalanDOMString::size_type theIndex =
indexOf(str1, str2);
fResult = theIndex < length(str1) ? true : false;
}
1.10 +2 -2 xml-xalan/c/src/XPath/FunctionID.cpp
Index: FunctionID.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionID.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionID.cpp 2001/09/20 18:05:34 1.9
+++ FunctionID.cpp 2001/09/26 20:58:46 1.10
@@ -270,9 +270,9 @@
const XObject& /* theXObject */,
const NodeRefListBase& theValue)
{
- const unsigned int theNodeCount = theValue.getLength();
+ const NodeRefListBase::size_type theNodeCount =
theValue.getLength();
- for (unsigned int i = 0 ; i < theNodeCount; i++)
+ for (NodeRefListBase::size_type i = 0 ; i < theNodeCount; i++)
{
DOMServices::getNodeData(*theValue.item(i), m_resultString);
1.10 +1 -1 xml-xalan/c/src/XPath/FunctionLang.cpp
Index: FunctionLang.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLang.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionLang.cpp 2001/09/20 18:05:34 1.9
+++ FunctionLang.cpp 2001/09/26 20:58:46 1.10
@@ -112,7 +112,7 @@
{
if(startsWith(toLowerCaseASCII(langVal),
toLowerCaseASCII(lang)))
{
- const unsigned int valLen =
length(lang);
+ const XalanDOMString::size_type
valLen = length(lang);
if(length(langVal) == valLen ||
charAt(langVal, valLen) ==
XalanUnicode::charHyphenMinus)
1.8 +1 -1 xml-xalan/c/src/XPath/FunctionLast.cpp
Index: FunctionLast.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLast.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionLast.cpp 2001/09/20 18:05:34 1.7
+++ FunctionLast.cpp 2001/09/26 20:58:46 1.8
@@ -80,7 +80,7 @@
XalanNode* /* context */,
const Locator* /* locator */) const
{
- const unsigned int theValue =
executionContext.getContextNodeListLength();
+ const NodeRefListBase::size_type theValue =
executionContext.getContextNodeListLength();
return executionContext.getXObjectFactory().createNumber(theValue);
}
1.15 +4 -4 xml-xalan/c/src/XPath/FunctionNormalizeSpace.cpp
Index: FunctionNormalizeSpace.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNormalizeSpace.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FunctionNormalizeSpace.cpp 2001/09/20 18:05:34 1.14
+++ FunctionNormalizeSpace.cpp 2001/09/26 20:58:46 1.15
@@ -133,7 +133,7 @@
XPathExecutionContext& executionContext,
const XalanDOMString& theString) const
{
- const unsigned int theStringLength = length(theString);
+ const XalanDOMString::size_type theStringLength =
length(theString);
// A string contain the result...
XPathExecutionContext::GetAndReleaseCachedString
theResult(executionContext);
@@ -177,7 +177,7 @@
}
}
- const unsigned int theNewStringLength = length(theNewString);
+ const XalanDOMString::size_type theNewStringLength =
length(theNewString);
if (theNewStringLength == 0)
{
@@ -241,7 +241,7 @@
bool
FunctionNormalizeSpace::needsNormalization(const XalanDOMString&
theString) const
{
- const unsigned int theStringLength = length(theString);
+ const XalanDOMString::size_type theStringLength =
length(theString);
bool fNormalize = false;
@@ -249,7 +249,7 @@
// OK, search for multiple spaces, or whitespace that is not the
// space character...
- for (unsigned int i = 0; i < theStringLength && fNormalize == false;
++i)
+ for (XalanDOMString::size_type i = 0; i < theStringLength && fNormalize
== false; ++i)
{
const XalanDOMChar theCurrentChar = charAt(theString, i);
1.8 +1 -1 xml-xalan/c/src/XPath/FunctionPosition.cpp
Index: FunctionPosition.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionPosition.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionPosition.cpp 2001/09/20 18:05:34 1.7
+++ FunctionPosition.cpp 2001/09/26 20:58:46 1.8
@@ -91,7 +91,7 @@
}
else
{
- const unsigned int theValue =
executionContext.getContextNodeListPosition(*context);
+ const NodeRefListBase::size_type theValue =
executionContext.getContextNodeListPosition(*context);
return
executionContext.getXObjectFactory().createNumber(theValue);
}
1.15 +14 -14 xml-xalan/c/src/XPath/FunctionSubstring.cpp
Index: FunctionSubstring.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstring.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FunctionSubstring.cpp 2001/09/20 18:05:34 1.14
+++ FunctionSubstring.cpp 2001/09/26 20:58:46 1.15
@@ -85,7 +85,7 @@
/*
* Get the value for the start index (C-style, not XPath).
*/
-inline unsigned int
+inline XalanDOMString::size_type
getStartIndex(double theSecondArgValue)
{
// We always subtract 1 for C-style index, since XPath indexes from 1.
@@ -97,7 +97,7 @@
}
else
{
- return unsigned(DoubleSupport::round(theSecondArgValue)) - 1;
+ return
XalanDOMString::size_type(DoubleSupport::round(theSecondArgValue)) - 1;
}
}
@@ -106,15 +106,15 @@
/*
* Get the length of the substring.
*/
-inline unsigned int
+inline XalanDOMString::size_type
getSubstringLength(
- unsigned int theSourceStringLength,
- unsigned int theStartIndex,
- double theThirdArgValue)
+ XalanDOMString::size_type theSourceStringLength,
+ XalanDOMString::size_type theStartIndex,
+ double
theThirdArgValue)
{
// The last index must be less than theThirdArgValue. Since it has
// already been rounded, subtracting 1 will do the job.
- const unsigned int theLastIndex = unsigned(theThirdArgValue - 1);
+ const XalanDOMString::size_type theLastIndex =
XalanDOMString::size_type(theThirdArgValue - 1);
if (theLastIndex >= theSourceStringLength)
{
@@ -133,9 +133,9 @@
*/
inline double
getTotal(
- unsigned int theSourceStringLength,
- double theSecondArgValue,
- const XObjectPtr& arg3)
+ XalanDOMString::size_type theSourceStringLength,
+ double
theSecondArgValue,
+ const XObjectPtr& arg3)
{
// Total the second and third arguments. Ithe third argument is
// missing, make it the length of the string + 1 (for XPath
@@ -200,8 +200,8 @@
{
assert(arg1.null() == false && arg2.null() == false);
- const XalanDOMString& theSourceString = arg1->str();
- const unsigned int theSourceStringLength =
length(theSourceString);
+ const XalanDOMString& theSourceString =
arg1->str();
+ const XalanDOMString::size_type theSourceStringLength =
length(theSourceString);
if (theSourceStringLength == 0)
{
@@ -214,7 +214,7 @@
DoubleSupport::round(arg2->num());
// XPath indexes from 1, so this is the first XPath index....
- const unsigned int theStartIndex =
getStartIndex(theSecondArgValue);
+ const XalanDOMString::size_type theStartIndex =
getStartIndex(theSecondArgValue);
if (theStartIndex >= theSourceStringLength)
{
@@ -234,7 +234,7 @@
}
else
{
- const unsigned int theSubstringLength =
+ const XalanDOMString::size_type
theSubstringLength =
getSubstringLength(
theSourceStringLength,
theStartIndex,
1.13 +5 -5 xml-xalan/c/src/XPath/FunctionSubstringAfter.cpp
Index: FunctionSubstringAfter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringAfter.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionSubstringAfter.cpp 2001/09/20 18:05:34 1.12
+++ FunctionSubstringAfter.cpp 2001/09/26 20:58:46 1.13
@@ -84,9 +84,9 @@
{
assert(arg1.null() == false && arg2.null() == false);
- const XalanDOMString& theFirstString = arg1->str();
+ const XalanDOMString& theFirstString =
arg1->str();
- const unsigned int theFirstStringLength =
length(theFirstString);
+ const XalanDOMString::size_type theFirstStringLength =
length(theFirstString);
if (theFirstStringLength == 0)
{
@@ -96,7 +96,7 @@
{
const XalanDOMString& theSecondString = arg2->str();
- const unsigned int theIndex =
indexOf(theFirstString,
+ const XalanDOMString::size_type theIndex =
indexOf(theFirstString,
theSecondString);
if (theIndex == theFirstStringLength)
@@ -105,7 +105,7 @@
}
else
{
- const unsigned int theSecondStringLength =
length(theSecondString);
+ const XalanDOMString::size_type
theSecondStringLength = length(theSecondString);
// Find the first character, which will be the offset
of the index of the
// beginning of the second string, plus the length of
the second string.
@@ -114,7 +114,7 @@
// The remaining length is just the opposite -- the
length of the string,
// minus the index, minus the length of the second
string.
- const unsigned int theSubstringLength =
+ const XalanDOMString::size_type
theSubstringLength =
theFirstStringLength - theIndex -
theSecondStringLength;
XPathExecutionContext::GetAndReleaseCachedString
theResult(executionContext);
1.13 +4 -4 xml-xalan/c/src/XPath/FunctionSubstringBefore.cpp
Index: FunctionSubstringBefore.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringBefore.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionSubstringBefore.cpp 2001/09/20 18:05:34 1.12
+++ FunctionSubstringBefore.cpp 2001/09/26 20:58:46 1.13
@@ -84,9 +84,9 @@
{
assert(arg1.null() == false && arg2.null() == false);
- const XalanDOMString& theFirstString = arg1->str();
+ const XalanDOMString& theFirstString =
arg1->str();
- const unsigned int theFirstStringLength =
length(theFirstString);
+ const XalanDOMString::size_type theFirstStringLength =
length(theFirstString);
if (theFirstStringLength == 0)
{
@@ -94,9 +94,9 @@
}
else
{
- const XalanDOMString& theSecondString = arg2->str();
+ const XalanDOMString& theSecondString
= arg2->str();
- const unsigned int theIndex =
indexOf(theFirstString,
+ const XalanDOMString::size_type theIndex =
indexOf(theFirstString,
theSecondString);
if (theIndex == theFirstStringLength)
1.10 +3 -3 xml-xalan/c/src/XPath/FunctionSum.cpp
Index: FunctionSum.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSum.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionSum.cpp 2001/09/20 18:05:34 1.9
+++ FunctionSum.cpp 2001/09/26 20:58:46 1.10
@@ -89,15 +89,15 @@
const NodeRefListBase& nl = arg1->nodeset();
- double sum = 0.0;
+ double sum =
0.0;
- const unsigned int count = nl.getLength();
+ const NodeRefListBase::size_type count = nl.getLength();
XPathExecutionContext::GetAndReleaseCachedString
theData(executionContext);
XalanDOMString& theString = theData.get();
- for (unsigned int i = 0; i < count; i++)
+ for (NodeRefListBase::size_type i = 0; i < count; i++)
{
DOMServices::getNodeData(*nl.item(i), theString);
1.13 +6 -6 xml-xalan/c/src/XPath/FunctionTranslate.cpp
Index: FunctionTranslate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTranslate.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionTranslate.cpp 2001/09/20 18:05:34 1.12
+++ FunctionTranslate.cpp 2001/09/26 20:58:46 1.13
@@ -89,9 +89,9 @@
const XalanDOMString& theSecondString = arg2->str();
const XalanDOMString& theThirdString = arg3->str();
- const unsigned int theFirstStringLength =
length(theFirstString);
- const unsigned int theSecondStringLength =
length(theSecondString);
- const unsigned int theThirdStringLength =
length(theThirdString);
+ const XalanDOMString::size_type theFirstStringLength =
length(theFirstString);
+ const XalanDOMString::size_type theSecondStringLength =
length(theSecondString);
+ const XalanDOMString::size_type theThirdStringLength =
length(theThirdString);
#if defined(XALAN_NO_NAMESPACES)
typedef vector<XalanDOMChar> VectorType;
@@ -109,11 +109,11 @@
// terminating 0.
reserve(theString, theFirstStringLength + 1);
- for (unsigned int i = 0; i < theFirstStringLength; i++)
+ for (XalanDOMString::size_type i = 0; i < theFirstStringLength; i++)
{
- const XalanDOMChar theCurrentChar =
charAt(theFirstString, i);
+ const XalanDOMChar
theCurrentChar = charAt(theFirstString, i);
- const unsigned int theIndex =
indexOf(theSecondString, theCurrentChar);
+ const XalanDOMString::size_type theIndex =
indexOf(theSecondString, theCurrentChar);
if (theIndex >= theSecondStringLength)
{
1.22 +15 -13 xml-xalan/c/src/XPath/MutableNodeRefList.cpp
Index: MutableNodeRefList.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/MutableNodeRefList.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MutableNodeRefList.cpp 2001/07/22 04:16:51 1.21
+++ MutableNodeRefList.cpp 2001/09/26 20:58:46 1.22
@@ -182,8 +182,8 @@
void
MutableNodeRefList::insertNode(
- XalanNode* n,
- unsigned int pos)
+ XalanNode* n,
+ size_type pos)
{
assert(m_nodeList.size() >= pos);
@@ -216,7 +216,7 @@
void
-MutableNodeRefList::removeNode(unsigned int pos)
+MutableNodeRefList::removeNode(size_type pos)
{
assert(pos < m_nodeList.size());
@@ -237,8 +237,8 @@
void
MutableNodeRefList::setNode(
- unsigned int pos,
- XalanNode* theNode)
+ size_type pos,
+ XalanNode* theNode)
{
assert(pos < m_nodeList.size());
@@ -250,11 +250,13 @@
void
MutableNodeRefList::addNodes(const XalanNodeList& nodelist)
{
- const unsigned int theLength = nodelist.getLength();
+ const size_type theLength = nodelist.getLength();
- for (unsigned int i = 0; i < theLength; i++)
+ for (size_type i = 0; i < theLength; i++)
{
- XalanNode* const theNode = nodelist.item(i);
+ assert(unsigned(i) == i);
+
+ XalanNode* const theNode = nodelist.item(unsigned(i));
if (theNode != 0)
{
@@ -269,9 +271,9 @@
void
MutableNodeRefList::addNodes(const NodeRefListBase& nodelist)
{
- const unsigned int theLength = nodelist.getLength();
+ const size_type theLength = nodelist.getLength();
- for (unsigned int i = 0; i < theLength; i++)
+ for (size_type i = 0; i < theLength; i++)
{
XalanNode* const theNode = nodelist.item(i);
@@ -305,9 +307,9 @@
const NodeRefListBase& nodelist,
XPathExecutionContext& executionContext)
{
- const unsigned int theOtherLength = nodelist.getLength();
+ const size_type theOtherLength = nodelist.getLength();
- for(unsigned int i = 0; i < theOtherLength; i++)
+ for(size_type i = 0; i < theOtherLength; i++)
{
addNodeInDocOrder(nodelist.item(i), executionContext);
}
@@ -591,7 +593,7 @@
{
if (node != 0)
{
- const unsigned int size = m_nodeList.size();
+ const size_type size = m_nodeList.size();
if (size == 0)
{
1.15 +7 -6 xml-xalan/c/src/XPath/MutableNodeRefList.hpp
Index: MutableNodeRefList.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/MutableNodeRefList.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MutableNodeRefList.hpp 2001/07/21 05:35:15 1.14
+++ MutableNodeRefList.hpp 2001/09/26 20:58:46 1.15
@@ -134,8 +134,8 @@
*/
void
insertNode(
- XalanNode* n,
- unsigned int pos);
+ XalanNode* n,
+ size_type pos);
/**
* Remove a node from the list.
@@ -151,7 +151,7 @@
* @param pos position of node in list
*/
void
- removeNode(unsigned int pos);
+ removeNode(size_type pos);
/**
* Remove all nodes.
@@ -166,8 +166,9 @@
* @param n node to insert, default is empty node
*/
void
- setNode(unsigned int pos,
- XalanNode* n = 0);
+ setNode(
+ size_type pos,
+ XalanNode* n = 0);
/**
* Copy NodeList members into this nodelist, adding in document order.
If
@@ -258,7 +259,7 @@
* @param theCount the number of nodes to reserve space for
*/
void
- reserve(unsigned int theCount)
+ reserve(size_type theCount)
{
m_nodeList.reserve(theCount);
}
1.12 +7 -7 xml-xalan/c/src/XPath/NodeRefList.cpp
Index: NodeRefList.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/NodeRefList.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NodeRefList.cpp 2000/12/04 20:46:17 1.11
+++ NodeRefList.cpp 2001/09/26 20:58:46 1.12
@@ -106,11 +106,11 @@
{
m_nodeList.clear();
- const unsigned int theLength = theRHS.getLength();
+ const size_type theLength = theRHS.getLength();
ensureAllocation(theLength);
- for(unsigned int i = 0; i < theLength; i++)
+ for(size_type i = 0; i < theLength; i++)
{
XalanNode* const theNode = theRHS.item(i);
@@ -146,7 +146,7 @@
XalanNode*
-NodeRefList::item(unsigned int index) const
+NodeRefList::item(size_type index) const
{
assert(index < m_nodeList.size());
@@ -155,7 +155,7 @@
-unsigned int
+NodeRefList::size_type
NodeRefList::getLength() const
{
return m_nodeList.size();
@@ -163,7 +163,7 @@
-unsigned int
+NodeRefList::size_type
NodeRefList::indexOf(const XalanNode* theNode) const
{
#if !defined(XALAN_NO_NAMESPACES)
@@ -195,13 +195,13 @@
bool fResult = false;
- const unsigned int theLength = getLength();
+ const size_type theLength = getLength();
if (theLength > 0)
{
NodeSetType theNodes;
- for (unsigned i = 0; i < theLength && fResult == false; ++i)
+ for (size_type i = 0; i < theLength && fResult == false; ++i)
{
const XalanNode* const theNode = item(i);
1.15 +3 -3 xml-xalan/c/src/XPath/NodeRefList.hpp
Index: NodeRefList.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/NodeRefList.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- NodeRefList.hpp 2000/12/04 20:46:17 1.14
+++ NodeRefList.hpp 2001/09/26 20:58:46 1.15
@@ -109,12 +109,12 @@
// These methods are inherited from NodeRefListBase ...
virtual XalanNode*
- item(unsigned int index) const;
+ item(size_type index) const;
- virtual unsigned int
+ virtual size_type
getLength() const;
- virtual unsigned int
+ virtual size_type
indexOf(const XalanNode* theNode) const;
#if !defined(NDEBUG)
1.11 +7 -5 xml-xalan/c/src/XPath/NodeRefListBase.hpp
Index: NodeRefListBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/NodeRefListBase.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NodeRefListBase.hpp 2001/08/06 01:38:53 1.10
+++ NodeRefListBase.hpp 2001/09/26 20:58:46 1.11
@@ -81,6 +81,8 @@
virtual
~NodeRefListBase();
+ typedef size_t size_type;
+
/**
* Returns the <code>index</code>th item in the collection. If
* <code>index</code> is greater than or equal to the number of nodes in
@@ -92,7 +94,7 @@
* valid index
*/
virtual XalanNode*
- item(unsigned int index) const = 0;
+ item(size_type index) const = 0;
/**
* Determine the number of nodes in the list. The range of valid child
node
@@ -100,7 +102,7 @@
*
* @return number of nodes
*/
- virtual unsigned int
+ virtual size_type
getLength() const = 0;
/**
@@ -109,13 +111,13 @@
* @param theNode node whose index to find
* @return index of node
*/
- virtual unsigned int
+ virtual size_type
indexOf(const XalanNode* theNode) const = 0;
#if defined(XALAN_INLINE_INITIALIZATION)
- static const unsigned int npos = ~0u;
+ static const size_type npos = ~0u;
#else
- static const unsigned int npos;
+ static const size_type npos;
#endif
protected:
1.2 +4 -2 xml-xalan/c/src/XPath/NodeRefListResultTreeFragProxy.cpp
Index: NodeRefListResultTreeFragProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/NodeRefListResultTreeFragProxy.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NodeRefListResultTreeFragProxy.cpp 2001/06/14 19:12:00 1.1
+++ NodeRefListResultTreeFragProxy.cpp 2001/09/26 20:58:46 1.2
@@ -145,7 +145,7 @@
XalanNode*
NodeRefListResultTreeFragProxy::getLastChild() const
{
- const unsigned int theLength = m_value.getLength();
+ const NodeRefListBase::size_type theLength = m_value.getLength();
return theLength == 0 ? 0 : m_value.item(theLength - 1);
}
@@ -353,5 +353,7 @@
unsigned int
NodeRefListResultTreeFragProxy::getLength() const
{
- return m_value.getLength();
+ assert(unsigned(m_value.getLength()) == m_value.getLength());
+
+ return unsigned(m_value.getLength());
}
1.13 +6 -5 xml-xalan/c/src/XPath/ResultTreeFrag.cpp
Index: ResultTreeFrag.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ResultTreeFrag.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ResultTreeFrag.cpp 2001/06/14 19:12:00 1.12
+++ ResultTreeFrag.cpp 2001/09/26 20:58:46 1.13
@@ -88,11 +88,11 @@
{
if (deepClone == true)
{
- const unsigned int theLength = theSource.m_children.size();
+ const NodeVectorType::size_type theLength =
theSource.m_children.size();
m_children.reserve(theLength);
- for (unsigned int i = 0; i < theLength; ++i)
+ for (NodeVectorType::size_type i = 0; i < theLength; ++i)
{
assert(theSource.m_children[i] != 0);
@@ -168,9 +168,8 @@
XalanNode*
ResultTreeFrag::getLastChild() const
{
- const unsigned int theLength = m_children.size();
+ const NodeVectorType::size_type theLength = m_children.size();
-
return theLength == 0 ? 0 : m_children.back();
}
@@ -441,5 +440,7 @@
unsigned int
ResultTreeFrag::getLength() const
{
- return m_children.size();
+ assert(unsigned(m_children.size()) == m_children.size());
+
+ return unsigned(m_children.size());
}
1.46 +8 -8 xml-xalan/c/src/XPath/SimpleNodeLocator.cpp
Index: SimpleNodeLocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/SimpleNodeLocator.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- SimpleNodeLocator.cpp 2001/09/14 20:06:26 1.45
+++ SimpleNodeLocator.cpp 2001/09/26 20:58:46 1.46
@@ -245,9 +245,9 @@
if(XPathExpression::eENDOP != nextStepType && continueStepRecursion ==
true)
{
- const unsigned int nContexts =
subQueryResults->getLength();
+ const NodeRefListBase::size_type nContexts =
subQueryResults->getLength();
- for(unsigned int i = 0; i < nContexts; i++)
+ for(NodeRefListBase::size_type i = 0; i < nContexts; i++)
{
XalanNode* const node = subQueryResults->item(i);
@@ -358,9 +358,9 @@
const XObjectPtr
obj(xpath.executeMore(context, opPos, executionContext));
assert(obj.get() != 0);
- const NodeRefListBase& nl = obj->nodeset();
+ const NodeRefListBase& nl =
obj->nodeset();
- const unsigned int len = nl.getLength();
+ const NodeRefListBase::size_type len =
nl.getLength();
if (nextStepType ==
XPathExpression::eMATCH_ANY_ANCESTOR_WITH_FUNCTION_CALL)
{
@@ -368,7 +368,7 @@
while(context != 0 && fFound == false)
{
- for(unsigned int i = 0; i < len; i++)
+ for(NodeRefListBase::size_type i = 0; i
< len; i++)
{
XalanNode* const n =
nl.item(i);
@@ -389,7 +389,7 @@
}
else
{
- for(unsigned int i = 0; i < len; i++)
+ for(NodeRefListBase::size_type i = 0; i < len;
i++)
{
XalanNode* const n = nl.item(i);
@@ -1830,9 +1830,9 @@
while(XPathExpression::eOP_PREDICATE == nextStepType)
{
- unsigned int i = 0;
+ NodeRefListBase::size_type i = 0;
- const unsigned int theLength = subQueryResults.getLength();
+ const NodeRefListBase::size_type theLength =
subQueryResults.getLength();
while(i < theLength)
{
1.12 +2 -2 xml-xalan/c/src/XPath/XBoolean.cpp
Index: XBoolean.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XBoolean.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XBoolean.cpp 2001/09/20 18:05:34 1.11
+++ XBoolean.cpp 2001/09/26 20:58:46 1.12
@@ -146,11 +146,11 @@
{
if (m_value == true)
{
- (formatterListener.*function)(c_wstr(s_trueString),
length(s_trueString));
+ (formatterListener.*function)(c_wstr(s_trueString),
FormatterListener::size_type(length(s_trueString)));
}
else
{
- (formatterListener.*function)(c_wstr(s_falseString),
length(s_falseString));
+ (formatterListener.*function)(c_wstr(s_falseString),
FormatterListener::size_type(length(s_falseString)));
}
}
1.22 +2 -2 xml-xalan/c/src/XPath/XNodeSet.hpp
Index: XNodeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSet.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XNodeSet.hpp 2001/06/14 19:12:05 1.21
+++ XNodeSet.hpp 2001/09/26 20:58:46 1.22
@@ -115,9 +115,9 @@
nodeset() const;
virtual XalanNode*
- item(unsigned int index) const;
+ item(size_type index) const;
- virtual unsigned int
+ virtual size_type
getLength() const;
/**
1.3 +3 -1 xml-xalan/c/src/XPath/XNodeSetBase.cpp
Index: XNodeSetBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetBase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XNodeSetBase.cpp 2001/09/20 18:05:34 1.2
+++ XNodeSetBase.cpp 2001/09/26 20:58:46 1.3
@@ -169,7 +169,9 @@
{
if (isEmpty(m_cachedStringValue) == false)
{
- (formatterListener.*function)(c_wstr(m_cachedStringValue),
length(m_cachedStringValue));
+ assert(length(m_cachedStringValue) ==
FormatterListener::size_type(length(m_cachedStringValue)));
+
+ (formatterListener.*function)(c_wstr(m_cachedStringValue),
FormatterListener::size_type(length(m_cachedStringValue)));
}
else if (getLength() > 0)
{
1.2 +4 -2 xml-xalan/c/src/XPath/XNodeSetBase.hpp
Index: XNodeSetBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetBase.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XNodeSetBase.hpp 2001/06/14 19:12:06 1.1
+++ XNodeSetBase.hpp 2001/09/26 20:58:46 1.2
@@ -80,6 +80,8 @@
{
public:
+ typedef size_t size_type;
+
/**
* Create an XNodeSetBase
*/
@@ -137,9 +139,9 @@
ProcessXObjectTypeCallback(XObjectTypeCallback&
theCallbackObject) const;
virtual XalanNode*
- item(unsigned int index) const = 0;
+ item(size_type index) const = 0;
- virtual unsigned int
+ virtual size_type
getLength() const = 0;
protected:
1.2 +4 -2 xml-xalan/c/src/XPath/XNodeSetResultTreeFragProxy.cpp
Index: XNodeSetResultTreeFragProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetResultTreeFragProxy.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XNodeSetResultTreeFragProxy.cpp 2001/06/14 19:12:06 1.1
+++ XNodeSetResultTreeFragProxy.cpp 2001/09/26 20:58:46 1.2
@@ -146,7 +146,7 @@
XalanNode*
XNodeSetResultTreeFragProxy::getLastChild() const
{
- const unsigned int theLength = m_value.getLength();
+ const XNodeSetBase::size_type theLength = m_value.getLength();
return theLength == 0 ? 0 : m_value.item(theLength - 1);
}
@@ -354,5 +354,7 @@
unsigned int
XNodeSetResultTreeFragProxy::getLength() const
{
- return m_value.getLength();
+ assert(unsigned(m_value.getLength()) == m_value.getLength());
+
+ return unsigned(m_value.getLength());
}
1.15 +3 -1 xml-xalan/c/src/XPath/XNumber.cpp
Index: XNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumber.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XNumber.cpp 2001/06/06 21:49:01 1.14
+++ XNumber.cpp 2001/09/26 20:58:46 1.15
@@ -131,7 +131,9 @@
{
const XalanDOMString& theValue = str();
- (formatterListener.*function)(c_wstr(theValue), length(theValue));
+ assert(length(theValue) ==
FormatterListener::size_type(length(theValue)));
+
+ (formatterListener.*function)(c_wstr(theValue),
FormatterListener::size_type(length(theValue)));
}
1.25 +9 -9 xml-xalan/c/src/XPath/XObject.cpp
Index: XObject.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObject.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XObject.cpp 2001/06/06 21:49:02 1.24
+++ XObject.cpp 2001/09/26 20:58:46 1.25
@@ -324,13 +324,13 @@
// is true if and only if some node in $x has the string-value
// foo; the latter is true if and only if all nodes in $x have
// the string-value foo.
- bool theResult = false;
+ bool theResult = false;
- const unsigned int len1 = theLHSNodeSet.getLength();
+ const NodeRefListBase::size_type len1 =
theLHSNodeSet.getLength();
if (len1 > 0)
{
- const unsigned int len2 = theRHSNodeSet.getLength();
+ const NodeRefListBase::size_type len2 =
theRHSNodeSet.getLength();
if (len2 > 0)
{
@@ -338,14 +338,14 @@
XPathExecutionContext::GetAndReleaseCachedString
s2(executionContext);
- for(unsigned int i = 0; i < len1 && theResult == false;
i++)
+ for(NodeRefListBase::size_type i = 0; i < len1 &&
theResult == false; i++)
{
const XalanNode* const theLHSNode =
theLHSNodeSet.item(i);
assert(theLHSNode != 0);
theTypeFunction(*theLHSNode, s1.get());
- for(unsigned int k = 0; k < len2 && theResult
== false; k++)
+ for(NodeRefListBase::size_type k = 0; k < len2
&& theResult == false; k++)
{
const XalanNode* const theRHSNode =
theRHSNodeSet.item(k);
assert(theRHSNode != 0);
@@ -381,13 +381,13 @@
{
bool theResult = false;
- const unsigned int len1 = theLHSNodeSet.getLength();
+ const NodeRefListBase::size_type len1 =
theLHSNodeSet.getLength();
XPathExecutionContext::GetAndReleaseCachedString
theGuard(executionContext);
XalanDOMString& theLHS = theGuard.get();
- for(unsigned int i = 0; i < len1 && theResult == false; i++)
+ for(NodeRefListBase::size_type i = 0; i < len1 && theResult == false;
i++)
{
const XalanNode* const theLHSNode = theLHSNodeSet.item(i);
assert(theLHSNode != 0);
@@ -417,9 +417,9 @@
{
bool theResult = false;
- const unsigned int len1 = theLHSNodeSet.getLength();
+ const NodeRefListBase::size_type len1 =
theLHSNodeSet.getLength();
- for(unsigned int i = 0; i < len1 && theResult == false; i++)
+ for(NodeRefListBase::size_type i = 0; i < len1 && theResult == false;
i++)
{
const XalanNode* const theLHSNode = theLHSNodeSet.item(i);
assert(theLHSNode != 0);
1.44 +4 -2 xml-xalan/c/src/XPath/XPathExecutionContext.hpp
Index: XPathExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContext.hpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- XPathExecutionContext.hpp 2001/09/14 20:06:26 1.43
+++ XPathExecutionContext.hpp 2001/09/26 20:58:46 1.44
@@ -115,6 +115,8 @@
typedef std::vector<XObjectPtr> XObjectArgVectorType;
#endif
+ typedef NodeRefListBase::size_type size_type;
+
explicit
XPathExecutionContext();
@@ -243,7 +245,7 @@
*
* @return length of list
*/
- virtual unsigned int
+ virtual size_type
getContextNodeListLength() const = 0;
/*
@@ -253,7 +255,7 @@
*
* @return position in list
*/
- virtual unsigned int
+ virtual size_type
getContextNodeListPosition(const XalanNode& contextNode)
const = 0;
/**
1.43 +3 -3 xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp
Index: XPathExecutionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- XPathExecutionContextDefault.cpp 2001/09/14 20:06:26 1.42
+++ XPathExecutionContextDefault.cpp 2001/09/26 20:58:46 1.43
@@ -239,7 +239,7 @@
-unsigned int
+XPathExecutionContextDefault::size_type
XPathExecutionContextDefault::getContextNodeListLength() const
{
if (m_throwFoundIndex == true)
@@ -252,7 +252,7 @@
-unsigned int
+XPathExecutionContextDefault::size_type
XPathExecutionContextDefault::getContextNodeListPosition(const XalanNode&
contextNode) const
{
if (m_throwFoundIndex == true)
@@ -261,7 +261,7 @@
}
// Get the index of the node...
- const unsigned int theIndex =
m_contextNodeList->indexOf(&contextNode);
+ const size_type theIndex =
m_contextNodeList->indexOf(&contextNode);
// If not found return 0. Otherwise, return the index + 1
return theIndex == NodeRefListBase::npos ? 0 : theIndex + 1;
1.39 +2 -2 xml-xalan/c/src/XPath/XPathExecutionContextDefault.hpp
Index: XPathExecutionContextDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.hpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- XPathExecutionContextDefault.hpp 2001/09/14 20:06:26 1.38
+++ XPathExecutionContextDefault.hpp 2001/09/26 20:58:46 1.39
@@ -206,10 +206,10 @@
virtual void
setContextNodeList(const NodeRefListBase& theList);
- virtual unsigned int
+ virtual size_type
getContextNodeListLength() const;
- virtual unsigned int
+ virtual size_type
getContextNodeListPosition(const XalanNode& contextNode)
const;
virtual bool
1.22 +7 -4 xml-xalan/c/src/XPath/XPathExpression.hpp
Index: XPathExpression.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExpression.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XPathExpression.hpp 2001/07/27 06:15:59 1.21
+++ XPathExpression.hpp 2001/09/26 20:58:46 1.22
@@ -781,14 +781,15 @@
if (theSize > s_opCodeMapLengthIndex)
{
- assert(theSize ==
-
OpCodeMapSizeType(m_opMap[s_opCodeMapLengthIndex]));
+ assert(theSize ==
OpCodeMapSizeType(m_opMap[s_opCodeMapLengthIndex]));
return m_opMap[s_opCodeMapLengthIndex];
}
else
{
- return theSize;
+ assert(theSize == OpCodeMapValueType(theSize));
+
+ return OpCodeMapValueType(theSize);
}
}
@@ -854,8 +855,10 @@
getNextOpCodePosition(OpCodeMapSizeType opPos) const
{
assert(opPos < opCodeMapSize());
+
+ assert(opPos + m_opMap[opPos + s_opCodeMapLengthIndex] ==
OpCodeMapValueType(opPos + m_opMap[opPos + s_opCodeMapLengthIndex]));
- return opPos + m_opMap[opPos + s_opCodeMapLengthIndex];
+ return OpCodeMapValueType(opPos + m_opMap[opPos +
s_opCodeMapLengthIndex]);
}
/**
1.26 +3 -1 xml-xalan/c/src/XPath/XResultTreeFrag.cpp
Index: XResultTreeFrag.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XResultTreeFrag.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XResultTreeFrag.cpp 2001/09/20 18:05:34 1.25
+++ XResultTreeFrag.cpp 2001/09/26 20:58:46 1.26
@@ -183,7 +183,9 @@
{
if (isEmpty(m_cachedStringValue) == false)
{
- (formatterListener.*function)(c_wstr(m_cachedStringValue),
length(m_cachedStringValue));
+ assert(length(m_cachedStringValue) ==
FormatterListener::size_type(length(m_cachedStringValue)));
+
+ (formatterListener.*function)(c_wstr(m_cachedStringValue),
FormatterListener::size_type(length(m_cachedStringValue)));
}
else
{
1.17 +3 -1 xml-xalan/c/src/XPath/XString.cpp
Index: XString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XString.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XString.cpp 2001/05/02 15:53:03 1.16
+++ XString.cpp 2001/09/26 20:58:46 1.17
@@ -128,5 +128,7 @@
FormatterListener& formatterListener,
MemberFunctionPtr function) const
{
- (formatterListener.*function)(c_wstr(m_value), length(m_value));
+ assert(length(m_value) ==
FormatterListener::size_type(length(m_value)));
+
+ (formatterListener.*function)(c_wstr(m_value),
FormatterListener::size_type(length(m_value)));
}
1.4 +3 -1 xml-xalan/c/src/XPath/XStringCached.cpp
Index: XStringCached.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringCached.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XStringCached.cpp 2001/05/02 15:53:11 1.3
+++ XStringCached.cpp 2001/09/26 20:58:46 1.4
@@ -111,7 +111,9 @@
FormatterListener& formatterListener,
MemberFunctionPtr function) const
{
- (formatterListener.*function)(c_wstr(m_value.get()),
length(m_value.get()));
+ assert(length(m_value.get()) ==
FormatterListener::size_type(length(m_value.get())));
+
+ (formatterListener.*function)(c_wstr(m_value.get()),
FormatterListener::size_type(length(m_value.get())));
}
1.3 +3 -1 xml-xalan/c/src/XPath/XStringReference.cpp
Index: XStringReference.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringReference.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XStringReference.cpp 2001/05/02 15:53:15 1.2
+++ XStringReference.cpp 2001/09/26 20:58:46 1.3
@@ -107,7 +107,9 @@
FormatterListener& formatterListener,
MemberFunctionPtr function) const
{
- (formatterListener.*function)(c_wstr(m_value), length(m_value));
+ assert(length(m_value) ==
FormatterListener::size_type(length(m_value)));
+
+ (formatterListener.*function)(c_wstr(m_value),
FormatterListener::size_type(length(m_value)));
}
1.5 +3 -1 xml-xalan/c/src/XPath/XToken.cpp
Index: XToken.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XToken.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XToken.cpp 2001/09/20 18:05:34 1.4
+++ XToken.cpp 2001/09/26 20:58:46 1.5
@@ -150,7 +150,9 @@
FormatterListener& formatterListener,
MemberFunctionPtr function) const
{
- (formatterListener.*function)(c_wstr(m_stringValue),
length(m_stringValue));
+ assert(length(m_stringValue) ==
FormatterListener::size_type(length(m_stringValue)));
+
+ (formatterListener.*function)(c_wstr(m_stringValue),
FormatterListener::size_type(length(m_stringValue)));
}
1.12 +3 -1 xml-xalan/c/src/XPath/XUnknown.cpp
Index: XUnknown.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XUnknown.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XUnknown.cpp 2001/05/02 15:53:28 1.11
+++ XUnknown.cpp 2001/09/26 20:58:46 1.12
@@ -142,7 +142,9 @@
FormatterListener& formatterListener,
MemberFunctionPtr function) const
{
- (formatterListener.*function)(c_wstr(m_value), length(m_value));
+ assert(length(m_value) ==
FormatterListener::size_type(length(m_value)));
+
+ (formatterListener.*function)(c_wstr(m_value),
FormatterListener::size_type(length(m_value)));
}
1.2 +14 -14 xml-xalan/c/src/XPath/XalanQName.cpp
Index: XalanQName.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQName.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanQName.cpp 2001/08/13 17:08:01 1.1
+++ XalanQName.cpp 2001/09/26 20:58:46 1.2
@@ -94,11 +94,13 @@
}
else
{
+ const NamespaceVectorType::size_type theSize =
namespaces.size();
+
if (reverse)
{
- for(int j = namespaces.size()-1; j >= 0; j--)
+ for(NamespaceVectorType::size_type j = theSize; j > 0;
--j)
{
- const NameSpace& ns = namespaces[j];
+ const NameSpace& ns = namespaces[j - 1];
const XalanDOMString& thisPrefix =
ns.getPrefix();
@@ -112,7 +114,7 @@
}
else
{
- for(unsigned int j = 0; j < namespaces.size(); j++)
+ for(NamespaceVectorType::size_type j = 0; j < theSize;
j++)
{
const NameSpace& ns = namespaces[j];
@@ -141,11 +143,9 @@
{
const XalanDOMString* nsURI = 0;
- const int depth = nsStack.size();
-
- for(int i = depth-1; i >= 0; i--)
+ for(NamespacesStackType::size_type i = nsStack.size(); i > 0; --i)
{
- const NamespaceVectorType& namespaces = nsStack[i];
+ const NamespaceVectorType& namespaces = nsStack[i - 1];
nsURI = getNamespaceForPrefix(namespaces, prefix, reverse);
@@ -166,9 +166,9 @@
{
const XalanDOMString* thePrefix = 0;
- for(int j = namespaces.size()-1; j >= 0; j--)
+ for(NamespaceVectorType::size_type j = namespaces.size(); j > 0; --j)
{
- const NameSpace& ns = namespaces[j];
+ const NameSpace& ns = namespaces[j - 1];
const XalanDOMString& thisURI = ns.getURI();
if(::equals(uri, thisURI))
@@ -190,15 +190,15 @@
const XalanDOMString& uri,
bool reverse)
{
- const XalanDOMString* thePrefix = 0;
+ const XalanDOMString* thePrefix = 0;
- const int depth = nsStack.size();
+ const NamespacesStackType::size_type depth = nsStack.size();
if (reverse)
{
- for(int i = depth-1; i >= 0; i--)
+ for(NamespacesStackType::size_type i = depth; i > 0; --i)
{
- const NamespaceVectorType& namespaces = nsStack[i];
+ const NamespaceVectorType& namespaces = nsStack[i
- 1];
thePrefix = getPrefixForNamespace(namespaces, uri,
reverse);
@@ -208,7 +208,7 @@
}
else
{
- for(int i = 0; i < depth; i++)
+ for(NamespacesStackType::size_type i = 0; i < depth; i++)
{
const NamespaceVectorType& namespaces = nsStack[i];
1.2 +3 -3 xml-xalan/c/src/XPath/XalanQNameByValue.cpp
Index: XalanQNameByValue.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQNameByValue.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanQNameByValue.cpp 2001/08/13 17:08:01 1.1
+++ XalanQNameByValue.cpp 2001/09/26 20:58:46 1.2
@@ -188,7 +188,7 @@
const XalanDOMChar* qname,
const NamespacesStackType& namespaces)
{
- const unsigned int indexOfNSSep = indexOf(qname,
XalanUnicode::charColon);
+ const XalanDOMString::size_type indexOfNSSep = indexOf(qname,
XalanUnicode::charColon);
if(indexOfNSSep < length(qname))
{
@@ -224,8 +224,8 @@
const XalanDOMString& qname,
const PrefixResolver& theResolver)
{
- const unsigned int indexOfNSSep = indexOf(qname,
XalanUnicode::charColon);
- const unsigned int theLength = length(qname);
+ const XalanDOMString::size_type indexOfNSSep = indexOf(qname,
XalanUnicode::charColon);
+ const XalanDOMString::size_type theLength = length(qname);
if(indexOfNSSep < theLength)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
