dbertoni 00/05/11 12:05:44
Modified: c/src/XPath XPath.cpp XPath.hpp XPathFunctionTable.hpp
Log:
Code cleanup for compatibility.
Revision Changes Path
1.17 +4 -4 xml-xalan/c/src/XPath/XPath.cpp
Index: XPath.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPath.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XPath.cpp 2000/05/05 15:09:46 1.16
+++ XPath.cpp 2000/05/11 19:05:43 1.17
@@ -227,11 +227,11 @@
break;
case XPathExpression::eOP_OR:
- result = or(context, opPos, executionContext);
+ result = Or(context, opPos, executionContext);
break;
case XPathExpression::eOP_AND:
- result = and(context, opPos, executionContext);
+ result = And(context, opPos, executionContext);
break;
case XPathExpression::eOP_NOTEQUALS:
@@ -676,7 +676,7 @@
XObject*
-XPath::or(
+XPath::Or(
XalanNode* context,
int opPos,
XPathExecutionContext& executionContext) const
@@ -704,7 +704,7 @@
XObject*
-XPath::and(
+XPath::And(
XalanNode* context,
int opPos,
XPathExecutionContext& executionContext) const
1.6 +2 -2 xml-xalan/c/src/XPath/XPath.hpp
Index: XPath.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPath.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPath.hpp 2000/04/11 14:46:16 1.5
+++ XPath.hpp 2000/05/11 19:05:43 1.6
@@ -479,7 +479,7 @@
* @return XBoolean set to true if the one of the two arguments are
true.
*/
virtual XObject*
- or(
+ Or(
XalanNode* context,
int opPos,
XPathExecutionContext& executionContext) const;
@@ -491,7 +491,7 @@
* @return XBoolean set to true if the two arguments are both true.
*/
virtual XObject*
- and(
+ And(
XalanNode* context,
int opPos,
XPathExecutionContext& executionContext) const;
1.4 +10 -5 xml-xalan/c/src/XPath/XPathFunctionTable.hpp
Index: XPathFunctionTable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFunctionTable.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathFunctionTable.hpp 2000/04/11 14:46:20 1.3
+++ XPathFunctionTable.hpp 2000/05/11 19:05:43 1.4
@@ -232,11 +232,16 @@
void
getInstalledFunctionNames(OutputIteratorType theIterator) const
{
- copy(m_FunctionCollection.begin(),
- m_FunctionCollection.end(),
- PairIsolatorOutputIterator<OutputIteratorType,
-
PairFirstIsolator<CollectionType::value_type> >(theIterator,
-
PairFirstIsolator<CollectionType::value_type>()));
+ CollectionType::const_iterator i =
+ m_FunctionCollection.begin();
+
+ while(i != m_FunctionCollection.end())
+ {
+ *theIterator = (*i).first;
+
+ ++i;
+ ++theIterator;
+ }
}
#endif
