dbertoni 2003/05/02 17:40:43
Modified: c/src/XPath XPathEnvSupportDefault.cpp
Log:
Replaced if defined() section with macros.
Revision Changes Path
1.36 +8 -5 xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp
Index: XPathEnvSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- XPathEnvSupportDefault.cpp 21 Nov 2002 01:26:18 -0000 1.35
+++ XPathEnvSupportDefault.cpp 3 May 2003 00:40:43 -0000 1.36
@@ -92,11 +92,8 @@
-#if !defined(XALAN_NO_STD_NAMESPACE)
-using std::cerr;
-using std::endl;
-using std::for_each;
-#endif
+XALAN_USING_STD(cerr)
+XALAN_USING_STD(endl)
@@ -118,6 +115,8 @@
void
XPathEnvSupportDefault::terminate()
{
+ XALAN_USING_STD(for_each)
+
// Clean up the extension namespaces vector
for_each(s_externalFunctions.begin(),
s_externalFunctions.end(),
@@ -139,6 +138,8 @@
XPathEnvSupportDefault::~XPathEnvSupportDefault()
{
+ XALAN_USING_STD(for_each)
+
// Clean up the extension namespaces vector
for_each(m_externalFunctions.begin(),
m_externalFunctions.end(),
@@ -514,6 +515,8 @@
++i;
}
#else
+ XALAN_USING_STD(for_each)
+
// Clean up the extension namespaces vector
for_each(thePair.second.begin(),
thePair.second.end(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
