dbertoni 2002/11/25 18:12:28
Modified: c/Tests/Harness FileUtility.cpp FileUtility.hpp
HarnessInit.cpp HarnessInit.hpp XMLFileReporter.cpp
XMLFileReporter.hpp
Log:
Updates for C++ namespace support.
Revision Changes Path
1.45 +18 -10 xml-xalan/c/Tests/Harness/FileUtility.cpp
Index: FileUtility.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/FileUtility.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- FileUtility.cpp 14 Nov 2002 23:53:39 -0000 1.44
+++ FileUtility.cpp 26 Nov 2002 02:12:27 -0000 1.45
@@ -129,6 +129,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const char* const xalanNodeTypes[] =
{
@@ -869,7 +873,7 @@
// This exception is being reported prior to this Catch, however,
however, I clarify that it's a SAX exception.
// It's a good indication that the Gold file is not a valid XML. When
this happens the transform result needs
// to be compared with the Gold, with a character by character basis,
not via the DOM compair.
- catch (const SAXException&)
+ catch (const XERCES_CPP_NAMESPACE_QUALIFIER SAXException&)
{
cout << "SAXException: Using fileCompare to check output.\n";
@@ -1551,25 +1555,25 @@
-static XalanDOMString s_xmlSuffix;
-static XalanDOMString s_pathSep;
+static XalanDOMString s_staticXmlSuffix;
+static XalanDOMString s_staticPathSep;
-const XalanDOMString& FileUtility::s_xmlSuffix = ::s_xmlSuffix;
-const XalanDOMString& FileUtility::s_pathSep = ::s_pathSep;
+const XalanDOMString& FileUtility::s_xmlSuffix = s_staticXmlSuffix;
+const XalanDOMString& FileUtility::s_pathSep = s_staticPathSep;
void
FileUtility::initialize()
{
- ::s_xmlSuffix = XALAN_STATIC_UCODE_STRING(".xml");
+ s_staticXmlSuffix = XALAN_STATIC_UCODE_STRING(".xml");
#if defined(WIN32)
- ::s_pathSep = XALAN_STATIC_UCODE_STRING("\\");
+ s_staticPathSep = XALAN_STATIC_UCODE_STRING("\\");
#else
- ::s_pathSep = XALAN_STATIC_UCODE_STRING("/");
+ s_staticPathSep = XALAN_STATIC_UCODE_STRING("/");
#endif
}
@@ -1578,6 +1582,10 @@
void
FileUtility::terminate()
{
- releaseMemory(::s_pathSep);
- releaseMemory(::s_xmlSuffix);
+ releaseMemory(s_staticXmlSuffix);
+ releaseMemory(s_staticPathSep);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.30 +9 -1 xml-xalan/c/Tests/Harness/FileUtility.hpp
Index: FileUtility.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/FileUtility.hpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- FileUtility.hpp 14 Nov 2002 23:53:39 -0000 1.29
+++ FileUtility.hpp 26 Nov 2002 02:12:27 -0000 1.30
@@ -78,9 +78,13 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// Misc typedefs and Global variables.
// These structures hold vectors of directory names and file names.
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XalanDOMString> FileNameVectorType;
#else
typedef std::vector<XalanDOMString> FileNameVectorType;
@@ -437,6 +441,10 @@
#endif
}; // end of class FileUtility
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +12 -2 xml-xalan/c/Tests/Harness/HarnessInit.cpp
Index: HarnessInit.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/HarnessInit.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HarnessInit.cpp 28 Feb 2002 06:08:57 -0000 1.2
+++ HarnessInit.cpp 26 Nov 2002 02:12:27 -0000 1.3
@@ -73,13 +73,19 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMInit* s_xalanDOMInit = 0;
+
+
HarnessInit::HarnessInit()
{
assert(s_xalanDOMInit == 0);
- XMLPlatformUtils::Initialize();
+ XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::Initialize();
s_xalanDOMInit = new XalanDOMInit;
@@ -96,5 +102,9 @@
s_xalanDOMInit = 0;
- XMLPlatformUtils::Terminate();
+ XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::Terminate();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/Tests/Harness/HarnessInit.hpp
Index: HarnessInit.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/HarnessInit.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HarnessInit.hpp 22 Jan 2002 18:47:59 -0000 1.3
+++ HarnessInit.hpp 26 Nov 2002 02:12:27 -0000 1.4
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// This class is exported from the Harness.dll
class HARNESS_API HarnessInit
{
@@ -73,6 +77,10 @@
~HarnessInit();
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.18 +8 -0 xml-xalan/c/Tests/Harness/XMLFileReporter.cpp
Index: XMLFileReporter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/XMLFileReporter.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XMLFileReporter.cpp 17 May 2002 05:52:27 -0000 1.17
+++ XMLFileReporter.cpp 26 Nov 2002 02:12:27 -0000 1.18
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// $$$ToDo: These strings must be initialized in a static call, and not at
initialization.
const XalanDOMString XMLFileReporter::OPT_FILENAME(L"filename");
const XalanDOMString XMLFileReporter::ELEM_RESULTSFILE(L"resultsfile");
@@ -738,3 +742,7 @@
return XalanDOMString(theTime, strlen(theTime) - 1);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +8 -6 xml-xalan/c/Tests/Harness/XMLFileReporter.hpp
Index: XMLFileReporter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/XMLFileReporter.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XMLFileReporter.hpp 31 Jul 2002 07:05:28 -0000 1.13
+++ XMLFileReporter.hpp 26 Nov 2002 02:12:27 -0000 1.14
@@ -74,13 +74,11 @@
-/**
- * Reporter that saves output to a simple XML-format file.
- * @author [EMAIL PROTECTED]
- * @version $Id$
- */
+XALAN_CPP_NAMESPACE_BEGIN
-#if defined(XALAN_NO_NAMESPACES)
+
+
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef map<XalanDOMString, XalanDOMString, less<XalanDOMString> >
Hashtable;
#else
typedef std::map<XalanDOMString, XalanDOMString> Hashtable;
@@ -410,6 +408,10 @@
bool m_flushOnCaseClose;
}; // end of class XMLFileReporter
+
+
+
+XALAN_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
