dbertoni 00/06/08 10:52:30
Modified: c/src/XPath SimpleNodeLocator.cpp
Log:
Fixed signed/unsigned mismatch. Moved look up of local name inside if
statement.
Revision Changes Path
1.15 +7 -7 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SimpleNodeLocator.cpp 2000/06/07 18:16:01 1.14
+++ SimpleNodeLocator.cpp 2000/06/08 17:52:18 1.15
@@ -1554,11 +1554,11 @@
queueIndex =
currentExpression.getOpCodeMapValue(opPos);
- const XalanDOMString targetLocalName =
- queueIndex >= 0 ?
currentExpression.getToken(queueIndex)->str() : XalanDOMString();
-
if(test == true)
{
+ const XalanDOMString targetLocalName
=
+ queueIndex >= 0
? currentExpression.getToken(queueIndex)->str() : XalanDOMString();
+
switch(nodeType)
{
case XalanNode::ATTRIBUTE_NODE:
@@ -1681,14 +1681,14 @@
while(XPathExpression::eOP_PREDICATE == nextStepType)
{
- int i = 0;
+ unsigned int i = 0;
- const int theLength = subQueryResults.getLength();
+ const unsigned int theLength = subQueryResults.getLength();
#if defined(XALAN_NO_NAMESPACES)
- typedef vector<int> FailedEntriesVectorType;
+ typedef vector<unsigned int> FailedEntriesVectorType;
#else
- typedef std::vector<int> FailedEntriesVectorType;
+ typedef std::vector<unsigned int> FailedEntriesVectorType;
#endif
// We'll accumulate the entries that we want to remove
// here, then remove them all at once.
