dbertoni 2002/11/20 17:30:09
Modified: c/src/XPath MutableNodeRefList.cpp XObjectFactory.hpp
XObjectFactoryDefault.cpp XObjectFactoryDefault.hpp
XPathExpression.cpp XPathExpression.hpp
Log:
Fixed ifdefs.
Revision Changes Path
1.26 +1 -1 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- MutableNodeRefList.cpp 21 Nov 2002 01:26:18 -0000 1.25
+++ MutableNodeRefList.cpp 21 Nov 2002 01:30:09 -0000 1.26
@@ -684,7 +684,7 @@
void
MutableNodeRefList::clearNulls()
{
-#if !defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_NO_STD_NAMESPACE)
using std::remove;
#endif
1.20 +1 -1 xml-xalan/c/src/XPath/XObjectFactory.hpp
Index: XObjectFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectFactory.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XObjectFactory.hpp 21 Nov 2002 01:26:18 -0000 1.19
+++ XObjectFactory.hpp 21 Nov 2002 01:30:09 -0000 1.20
@@ -258,7 +258,7 @@
* A public functor for use with stl algorithms.
*
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DeleteXObjectFunctor : public unary_function<XObject*, void>
#else
struct DeleteXObjectFunctor : public std::unary_function<XObject*, void>
1.30 +1 -3 xml-xalan/c/src/XPath/XObjectFactoryDefault.cpp
Index: XObjectFactoryDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectFactoryDefault.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XObjectFactoryDefault.cpp 21 Nov 2002 01:26:18 -0000 1.29
+++ XObjectFactoryDefault.cpp 21 Nov 2002 01:30:09 -0000 1.30
@@ -266,9 +266,7 @@
default:
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
const XObjectCollectionType::iterator i =
find(m_xobjects.begin(),
m_xobjects.end(), theXObject);
1.26 +1 -1 xml-xalan/c/src/XPath/XObjectFactoryDefault.hpp
Index: XObjectFactoryDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectFactoryDefault.hpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XObjectFactoryDefault.hpp 21 Nov 2002 01:26:18 -0000 1.25
+++ XObjectFactoryDefault.hpp 21 Nov 2002 01:30:09 -0000 1.26
@@ -188,7 +188,7 @@
createUnknown(
const XalanDOMString& theValue);
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XObject*> XObjectCollectionType;
typedef vector<XNumber*> XNumberCacheType;
typedef vector<XNodeSet*> XNodeSetCacheType;
1.41 +1 -5 xml-xalan/c/src/XPath/XPathExpression.cpp
Index: XPathExpression.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExpression.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- XPathExpression.cpp 21 Nov 2002 01:26:18 -0000 1.40
+++ XPathExpression.cpp 21 Nov 2002 01:30:09 -0000 1.41
@@ -788,11 +788,7 @@
void
-#if defined(XALAN_NO_NAMESPACES)
-XPathExpression::dumpRemainingTokenQueue(ostream& theStream) const
-#else
-XPathExpression::dumpRemainingTokenQueue(std::ostream& theStream) const
-#endif
+XPathExpression::dumpRemainingTokenQueue(OstreamType& theStream) const
{
theStream << "Remaining tokens: (";
1.31 +1 -5 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XPathExpression.hpp 21 Nov 2002 01:26:18 -0000 1.30
+++ XPathExpression.hpp 21 Nov 2002 01:30:09 -0000 1.31
@@ -1310,11 +1310,7 @@
* @param theStream The output stream
*/
void
-#if defined(XALAN_NO_NAMESPACES)
- dumpRemainingTokenQueue(ostream& theStream) const;
-#else
- dumpRemainingTokenQueue(std::ostream& theStream) const;
-#endif
+ dumpRemainingTokenQueue(OstreamType& theStream) const;
/**
* Push a value onto the operations code
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
