dbertoni 2002/11/20 16:26:09
Modified: c/src/XalanDOM XalanDOMString.cpp XalanDOMString.hpp
Log:
Fixed ifdefs.
Revision Changes Path
1.29 +1 -1 xml-xalan/c/src/XalanDOM/XalanDOMString.cpp
Index: XalanDOMString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanDOM/XalanDOMString.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XalanDOMString.cpp 20 Nov 2002 02:28:09 -0000 1.28
+++ XalanDOMString.cpp 21 Nov 2002 00:26:08 -0000 1.29
@@ -763,7 +763,7 @@
const SourceType* theSourceString,
XalanDOMString::size_type theSourceStringLength,
bool
theSourceStringIsNullTerminated,
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
vector<TargetType>& theTargetVector,
#else
std::vector<TargetType>& theTargetVector,
1.25 +3 -3 xml-xalan/c/src/XalanDOM/XalanDOMString.hpp
Index: XalanDOMString.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanDOM/XalanDOMString.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XalanDOMString.hpp 20 Nov 2002 02:28:09 -0000 1.24
+++ XalanDOMString.hpp 21 Nov 2002 00:26:08 -0000 1.25
@@ -92,7 +92,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XalanDOMChar> XalanDOMCharVectorType;
typedef vector<char> CharVectorType;
typedef vector<wchar_t> WideCharVectorType;
@@ -374,7 +374,7 @@
m_data.swap(theOther.m_data);
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
::swap(m_size, theOther.m_size);
#else
std::swap(m_size, theOther.m_size);
@@ -950,7 +950,7 @@
// Standard vector of XalanDOMChars and chars
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XalanDOMChar> XalanDOMCharVectorType;
typedef vector<char> CharVectorType;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
