dbertoni 2002/11/27 14:36:45
Modified: c/samples/ThreadSafe ThreadSafe.cpp
c/samples/XPathWrapper XPathWrapper.cpp XPathWrapper.hpp
Log:
Updates for C++ namespace support.
Revision Changes Path
1.21 +1 -3 xml-xalan/c/samples/ThreadSafe/ThreadSafe.cpp
Index: ThreadSafe.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/ThreadSafe/ThreadSafe.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ThreadSafe.cpp 27 Nov 2002 19:22:06 -0000 1.20
+++ ThreadSafe.cpp 27 Nov 2002 22:36:44 -0000 1.21
@@ -123,9 +123,7 @@
void
doThreads(int nThreads)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::vector;
-#endif
+ XALAN_USING_STD(vector)
vector<HANDLE> hThreads;
1.22 +3 -13 xml-xalan/c/samples/XPathWrapper/XPathWrapper.cpp
Index: XPathWrapper.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/XPathWrapper/XPathWrapper.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XPathWrapper.cpp 27 Nov 2002 19:22:07 -0000 1.21
+++ XPathWrapper.cpp 27 Nov 2002 22:36:45 -0000 1.22
@@ -2,7 +2,6 @@
-#include <vector>
#include <cassert>
@@ -54,10 +53,9 @@
-#if !defined(XALAN_NO_NAMESPACES)
-using std::endl;
-using std::vector;
-#endif
+XALAN_USING_STD(cerr)
+XALAN_USING_STD(endl)
+XALAN_USING_STD(ostream)
@@ -73,11 +71,7 @@
const char* xml,
const char* context,
const char* expr,
-#if defined(XALAN_NO_STD_NAMESPACE)
ostream& errorStream)
-#else
- std::ostream& errorStream)
-#endif
{
#if defined(XALAN_STRICT_ANSI_HEADERS)
using std::strlen;
@@ -281,11 +275,7 @@
xml,
context,
path,
-#if defined(XALAN_NO_NAMESPACES)
cerr);
-#else
- std::cerr);
-#endif
}
1.8 +1 -1 xml-xalan/c/samples/XPathWrapper/XPathWrapper.hpp
Index: XPathWrapper.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/XPathWrapper/XPathWrapper.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XPathWrapper.hpp 27 Nov 2002 19:22:07 -0000 1.7
+++ XPathWrapper.hpp 27 Nov 2002 22:36:45 -0000 1.8
@@ -88,7 +88,7 @@
typedef XALAN_CPP_NAMESPACE_QUALIFIER CharVectorType CharVectorType;
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<CharVectorType>
CharVectorTypeVectorType;
#else
typedef std::vector<CharVectorType>
CharVectorTypeVectorType;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
