Use xercesc namespace unconditionally
There are no current compilers which lack namespace support, and all
current xerces-c builds are using namespaces by default.
diff --git a/Tests/Threads/ThreadTest.cpp b/Tests/Threads/ThreadTest.cpp
index af9283e..c4fa738 100644
--- a/Tests/Threads/ThreadTest.cpp
+++ b/Tests/Threads/ThreadTest.cpp
@@ -99,8 +99,8 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLMutex XMLMutexType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLMutexLock XMLMutexLockType;
+typedef xercesc::XMLMutex XMLMutexType;
+typedef xercesc::XMLMutexLock XMLMutexLockType;
diff --git a/samples/XPathWrapper/TestDriver.cpp b/samples/XPathWrapper/TestDriver.cpp
index 095badc..441873c 100644
--- a/samples/XPathWrapper/TestDriver.cpp
+++ b/samples/XPathWrapper/TestDriver.cpp
@@ -119,7 +119,7 @@
for (size_t i=0; i<len; i++)
cout << "item " << (i+1) << "= \"" << &*result[i].begin() << "\"" << endl;
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER XMLException&)
+ catch(const xercesc::XMLException&)
{
cerr << "Exception caught! Exiting..." << endl;
}
diff --git a/src/xalanc/Harness/XalanFileUtility.cpp b/src/xalanc/Harness/XalanFileUtility.cpp
index e0c77d8..34cd27f 100644
--- a/src/xalanc/Harness/XalanFileUtility.cpp
+++ b/src/xalanc/Harness/XalanFileUtility.cpp
@@ -919,22 +919,22 @@
-class DummyErrorHandler : public XERCES_CPP_NAMESPACE_QUALIFIER ErrorHandler
+class DummyErrorHandler : public xercesc::ErrorHandler
{
virtual void
- warning(const XERCES_CPP_NAMESPACE_QUALIFIER SAXParseException& exc)
+ warning(const xercesc::SAXParseException& exc)
{
throw exc;
}
virtual void
- error(const XERCES_CPP_NAMESPACE_QUALIFIER SAXParseException& exc)
+ error(const xercesc::SAXParseException& exc)
{
throw exc;
}
virtual void
- fatalError(const XERCES_CPP_NAMESPACE_QUALIFIER SAXParseException& exc)
+ fatalError(const xercesc::SAXParseException& exc)
{
throw exc;
}
@@ -991,7 +991,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 XERCES_CPP_NAMESPACE_QUALIFIER SAXException&)
+ catch (const xercesc::SAXException&)
{
if (m_verbose == true)
{
diff --git a/src/xalanc/Include/PlatformDefinitions.hpp b/src/xalanc/Include/PlatformDefinitions.hpp
index 22fb4b4..6692a13 100644
--- a/src/xalanc/Include/PlatformDefinitions.hpp
+++ b/src/xalanc/Include/PlatformDefinitions.hpp
@@ -107,7 +107,7 @@
#define XALAN_DECLARE_XERCES_CLASS(NAME) XALAN_DECLARE_CLASS(XERCES_CPP_NAMESPACE, NAME)
#define XALAN_DECLARE_XERCES_STRUCT(NAME) XALAN_DECLARE_STRUCT(XERCES_CPP_NAMESPACE, NAME)
#else
- #define XERCES_CPP_NAMESPACE_QUALIFIER
+ #define xercesc::
#define XERCES_CPP_NAMESPACE_BEGIN
#define XERCES_CPP_NAMESPACE_END
#define XERCES_CPP_NAMESPACE_USE
diff --git a/src/xalanc/PlatformSupport/AttributeListImpl.hpp b/src/xalanc/PlatformSupport/AttributeListImpl.hpp
index 0e5929a..ddbcd3b 100644
--- a/src/xalanc/PlatformSupport/AttributeListImpl.hpp
+++ b/src/xalanc/PlatformSupport/AttributeListImpl.hpp
@@ -42,7 +42,7 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
+typedef xercesc::AttributeList AttributeListType;
diff --git a/src/xalanc/PlatformSupport/AttributesImpl.hpp b/src/xalanc/PlatformSupport/AttributesImpl.hpp
index e0caacb..0510407 100644
--- a/src/xalanc/PlatformSupport/AttributesImpl.hpp
+++ b/src/xalanc/PlatformSupport/AttributesImpl.hpp
@@ -41,7 +41,7 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER Attributes AttributesType;
+typedef xercesc::Attributes AttributesType;
diff --git a/src/xalanc/PlatformSupport/ExecutionContext.hpp b/src/xalanc/PlatformSupport/ExecutionContext.hpp
index 7a40974..eec3532 100644
--- a/src/xalanc/PlatformSupport/ExecutionContext.hpp
+++ b/src/xalanc/PlatformSupport/ExecutionContext.hpp
@@ -41,7 +41,7 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+typedef xercesc::Locator LocatorType;
diff --git a/src/xalanc/PlatformSupport/FormatterListener.hpp b/src/xalanc/PlatformSupport/FormatterListener.hpp
index 9c78ccb..11e5973 100644
--- a/src/xalanc/PlatformSupport/FormatterListener.hpp
+++ b/src/xalanc/PlatformSupport/FormatterListener.hpp
@@ -42,8 +42,8 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
+typedef xercesc::Locator LocatorType;
+typedef xercesc::AttributeList AttributeListType;
XALAN_USING_XERCES(Locator)
XALAN_USING_XERCES(AttributeList)
@@ -53,11 +53,11 @@
* A SAX-based formatter interface for the XSL processor. This interface
* will be called as result tree elements are constructed.
*/
-class XALAN_PLATFORMSUPPORT_EXPORT FormatterListener : public XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler
+class XALAN_PLATFORMSUPPORT_EXPORT FormatterListener : public xercesc::DocumentHandler
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler ParentType;
+ typedef xercesc::DocumentHandler ParentType;
// A handy typedef... Must match DocumentHandler's type for characters(), etc...
typedef XalanSize_t size_type;
diff --git a/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp b/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp
index ff68561..0b59529 100644
--- a/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp
+++ b/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp
@@ -38,11 +38,11 @@
-class XALAN_PLATFORMSUPPORT_EXPORT NamedNodeMapAttributeList : public XERCES_CPP_NAMESPACE_QUALIFIER AttributeList
+class XALAN_PLATFORMSUPPORT_EXPORT NamedNodeMapAttributeList : public xercesc::AttributeList
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList ParentType;
+ typedef xercesc::AttributeList ParentType;
explicit
NamedNodeMapAttributeList(
diff --git a/src/xalanc/PlatformSupport/StdBinInputStream.hpp b/src/xalanc/PlatformSupport/StdBinInputStream.hpp
index 7414a9f..75895fd 100644
--- a/src/xalanc/PlatformSupport/StdBinInputStream.hpp
+++ b/src/xalanc/PlatformSupport/StdBinInputStream.hpp
@@ -42,11 +42,11 @@
-class XALAN_PLATFORMSUPPORT_EXPORT StdBinInputStream : public XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream
+class XALAN_PLATFORMSUPPORT_EXPORT StdBinInputStream : public xercesc::BinInputStream
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream ParentType;
+ typedef xercesc::BinInputStream ParentType;
#if defined(XALAN_NO_STD_NAMESPACE)
typedef istream StreamType;
diff --git a/src/xalanc/PlatformSupport/URISupport.hpp b/src/xalanc/PlatformSupport/URISupport.hpp
index b8e0727..75bf9e6 100644
--- a/src/xalanc/PlatformSupport/URISupport.hpp
+++ b/src/xalanc/PlatformSupport/URISupport.hpp
@@ -45,7 +45,7 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLURL XMLURLType;
+typedef xercesc::XMLURL XMLURLType;
diff --git a/src/xalanc/PlatformSupport/XSLException.hpp b/src/xalanc/PlatformSupport/XSLException.hpp
index da8258d..e96b1d1 100644
--- a/src/xalanc/PlatformSupport/XSLException.hpp
+++ b/src/xalanc/PlatformSupport/XSLException.hpp
@@ -34,7 +34,7 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+typedef xercesc::Locator LocatorType;
XALAN_USING_XERCES(Locator)
diff --git a/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp b/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp
index 379c9c6..e5c8e8f 100644
--- a/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp
+++ b/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp
@@ -29,7 +29,7 @@
#include <xalanc/Include/XalanMemMgrAutoPtr.hpp>
-typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLException XMLExceptionType;
+typedef xercesc::XMLException XMLExceptionType;
diff --git a/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp b/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp
index 6f84c9a..beec4d6 100644
--- a/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp
+++ b/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp
@@ -42,7 +42,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLTranscoder XMLTranscoderType;
+ typedef xercesc::XMLTranscoder XMLTranscoderType;
explicit
XalanToXercesTranscoderWrapper(MemoryManager& theManager, XMLTranscoderType& theTranscoder);
diff --git a/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp b/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp
index 2d1ca6c..4dc34c0 100644
--- a/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp
+++ b/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp
@@ -112,7 +112,7 @@
// For creation data file responsible subclasses
-class SAX2Handler : public XERCES_CPP_NAMESPACE_QUALIFIER DefaultHandler
+class SAX2Handler : public xercesc::DefaultHandler
{
public:
// -----------------------------------------------------------------------
diff --git a/src/xalanc/XMLSupport/XMLParserLiaison.hpp b/src/xalanc/XMLSupport/XMLParserLiaison.hpp
index a2001dd..e72234d 100644
--- a/src/xalanc/XMLSupport/XMLParserLiaison.hpp
+++ b/src/xalanc/XMLSupport/XMLParserLiaison.hpp
@@ -41,10 +41,10 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler DocumentHandlerType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER EntityResolver EntityResolverType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER ErrorHandler ErrorHandlerType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER InputSource InputSourceType;
+typedef xercesc::DocumentHandler DocumentHandlerType;
+typedef xercesc::EntityResolver EntityResolverType;
+typedef xercesc::ErrorHandler ErrorHandlerType;
+typedef xercesc::InputSource InputSourceType;
XALAN_USING_XERCES(DocumentHandler)
XALAN_USING_XERCES(EntityResolver)
diff --git a/src/xalanc/XPath/Function.hpp b/src/xalanc/XPath/Function.hpp
index 41941cb..86610f4 100644
--- a/src/xalanc/XPath/Function.hpp
+++ b/src/xalanc/XPath/Function.hpp
@@ -55,7 +55,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+ typedef xercesc::Locator LocatorType;
explicit
Function();
diff --git a/src/xalanc/XPath/XPath.hpp b/src/xalanc/XPath/XPath.hpp
index 62ebce8..62e8eca 100644
--- a/src/xalanc/XPath/XPath.hpp
+++ b/src/xalanc/XPath/XPath.hpp
@@ -65,7 +65,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+ typedef xercesc::Locator LocatorType;
typedef XPathExpression::OpCodeMapPositionType OpCodeMapPositionType;
typedef XPathExpression::OpCodeMapValueType OpCodeMapValueType;
diff --git a/src/xalanc/XPath/XPathConstructionContext.hpp b/src/xalanc/XPath/XPathConstructionContext.hpp
index 2d2f2b6..c0beba3 100644
--- a/src/xalanc/XPath/XPathConstructionContext.hpp
+++ b/src/xalanc/XPath/XPathConstructionContext.hpp
@@ -41,7 +41,7 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+typedef xercesc::Locator LocatorType;
XALAN_USING_XERCES(Locator)
diff --git a/src/xalanc/XPath/XPathEnvSupport.hpp b/src/xalanc/XPath/XPathEnvSupport.hpp
index 3e11e0d..d84fa6c 100644
--- a/src/xalanc/XPath/XPathEnvSupport.hpp
+++ b/src/xalanc/XPath/XPathEnvSupport.hpp
@@ -58,7 +58,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+ typedef xercesc::Locator LocatorType;
typedef Function::XObjectArgVectorType XObjectArgVectorType;
diff --git a/src/xalanc/XPath/XPathProcessor.hpp b/src/xalanc/XPath/XPathProcessor.hpp
index 657fa54..d4c31ab 100644
--- a/src/xalanc/XPath/XPathProcessor.hpp
+++ b/src/xalanc/XPath/XPathProcessor.hpp
@@ -54,7 +54,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+ typedef xercesc::Locator LocatorType;
explicit
XPathProcessor();
diff --git a/src/xalanc/XPath/XalanQNameByValue.hpp b/src/xalanc/XPath/XalanQNameByValue.hpp
index 94f62db..a546488 100644
--- a/src/xalanc/XPath/XalanQNameByValue.hpp
+++ b/src/xalanc/XPath/XalanQNameByValue.hpp
@@ -47,7 +47,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+ typedef xercesc::Locator LocatorType;
/**
* Construct an empty XalanQNameByValue.
diff --git a/src/xalanc/XSLT/AVT.hpp b/src/xalanc/XSLT/AVT.hpp
index 1890221..c458767 100644
--- a/src/xalanc/XSLT/AVT.hpp
+++ b/src/xalanc/XSLT/AVT.hpp
@@ -35,7 +35,7 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+typedef xercesc::Locator LocatorType;
XALAN_USING_XERCES(Locator)
diff --git a/src/xalanc/XSLT/ElemTemplateElement.hpp b/src/xalanc/XSLT/ElemTemplateElement.hpp
index afc31df..08ee223 100644
--- a/src/xalanc/XSLT/ElemTemplateElement.hpp
+++ b/src/xalanc/XSLT/ElemTemplateElement.hpp
@@ -57,8 +57,8 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+typedef xercesc::AttributeList AttributeListType;
+typedef xercesc::Locator LocatorType;
XALAN_USING_XERCES(AttributeList)
diff --git a/src/xalanc/XSLT/FunctionDocument.cpp b/src/xalanc/XSLT/FunctionDocument.cpp
index 3e0aa04..12be671 100644
--- a/src/xalanc/XSLT/FunctionDocument.cpp
+++ b/src/xalanc/XSLT/FunctionDocument.cpp
@@ -139,7 +139,7 @@
}
virtual void
- warning(const XERCES_CPP_NAMESPACE_QUALIFIER SAXParseException& exc)
+ warning(const xercesc::SAXParseException& exc)
{
const GetCachedString theGuard(m_executionContext);
@@ -156,13 +156,13 @@
}
virtual void
- error(const XERCES_CPP_NAMESPACE_QUALIFIER SAXParseException& exc)
+ error(const xercesc::SAXParseException& exc)
{
warning(exc);
}
virtual void
- fatalError(const XERCES_CPP_NAMESPACE_QUALIFIER SAXParseException& exc)
+ fatalError(const xercesc::SAXParseException& exc)
{
m_fatal = true;
diff --git a/src/xalanc/XSLT/GenerateEvent.hpp b/src/xalanc/XSLT/GenerateEvent.hpp
index a8c5408..3125ea2 100644
--- a/src/xalanc/XSLT/GenerateEvent.hpp
+++ b/src/xalanc/XSLT/GenerateEvent.hpp
@@ -37,7 +37,7 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
+typedef xercesc::AttributeList AttributeListType;
diff --git a/src/xalanc/XSLT/Stylesheet.cpp b/src/xalanc/XSLT/Stylesheet.cpp
index dc073a7..fab40b4 100644
--- a/src/xalanc/XSLT/Stylesheet.cpp
+++ b/src/xalanc/XSLT/Stylesheet.cpp
@@ -138,7 +138,7 @@
m_baseIdent = urlString;
}
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtilsException&)
+ catch(const xercesc::XMLPlatformUtilsException&)
{
// Assume that any exception here relates to get the urlString from
// m_baseIdent. We'll assume that it's just a fake base identifier
diff --git a/src/xalanc/XSLT/StylesheetConstructionContext.hpp b/src/xalanc/XSLT/StylesheetConstructionContext.hpp
index 3497093..f493374 100644
--- a/src/xalanc/XSLT/StylesheetConstructionContext.hpp
+++ b/src/xalanc/XSLT/StylesheetConstructionContext.hpp
@@ -49,8 +49,8 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler DocumentHandlerType;
+typedef xercesc::AttributeList AttributeListType;
+typedef xercesc::DocumentHandler DocumentHandlerType;
XALAN_USING_XERCES(AttributeList)
XALAN_USING_XERCES(DocumentHandler)
diff --git a/src/xalanc/XSLT/XSLTEngineImpl.cpp b/src/xalanc/XSLT/XSLTEngineImpl.cpp
index 2082fec..88da343 100644
--- a/src/xalanc/XSLT/XSLTEngineImpl.cpp
+++ b/src/xalanc/XSLT/XSLTEngineImpl.cpp
@@ -559,7 +559,7 @@
{
URISupport::getURLStringFromString(theSystemID, xmlIdentifier);
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER XMLException&)
+ catch(const xercesc::XMLException&)
{
xmlIdentifier = theSystemID;
}
@@ -932,7 +932,7 @@
localXSLURLString);
}
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER XMLException&)
+ catch(const xercesc::XMLException&)
{
}
diff --git a/src/xalanc/XSLT/XSLTEngineImpl.hpp b/src/xalanc/XSLT/XSLTEngineImpl.hpp
index 592cefa..853b96d 100644
--- a/src/xalanc/XSLT/XSLTEngineImpl.hpp
+++ b/src/xalanc/XSLT/XSLTEngineImpl.hpp
@@ -87,8 +87,8 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER InputSource InputSourceType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler DocumentHandlerType;
+typedef xercesc::InputSource InputSourceType;
+typedef xercesc::DocumentHandler DocumentHandlerType;
XALAN_USING_XERCES(InputSource)
XALAN_USING_XERCES(DocumentHandler)
diff --git a/src/xalanc/XSLT/XSLTInputSource.hpp b/src/xalanc/XSLT/XSLTInputSource.hpp
index 5742de3..a99e62b 100644
--- a/src/xalanc/XSLT/XSLTInputSource.hpp
+++ b/src/xalanc/XSLT/XSLTInputSource.hpp
@@ -50,8 +50,8 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream BinInputStreamType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER InputSource InputSourceType;
+typedef xercesc::BinInputStream BinInputStreamType;
+typedef xercesc::InputSource InputSourceType;
XALAN_USING_XERCES(MemoryManager)
diff --git a/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp b/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp
index 2f5a080..edba22b 100644
--- a/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp
+++ b/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp
@@ -160,7 +160,6 @@
#endif
-
XObjectPtr
XalanEXSLTFunctionDateTime::execute(
XPathExecutionContext& executionContext,
diff --git a/src/xalanc/XalanExe/XalanExe.cpp b/src/xalanc/XalanExe/XalanExe.cpp
index 941d128..103f658 100644
--- a/src/xalanc/XalanExe/XalanExe.cpp
+++ b/src/xalanc/XalanExe/XalanExe.cpp
@@ -862,7 +862,7 @@
if (value == 0)
{
- throw XERCES_CPP_NAMESPACE_QUALIFIER OutOfMemoryException();
+ throw xercesc::OutOfMemoryException();
}
return value;
@@ -917,7 +917,7 @@
// Call the static initializer for Xerces...
XMLPlatformUtils::Initialize(
- XERCES_CPP_NAMESPACE_QUALIFIER XMLUni::fgXercescDefaultLocale,
+ xercesc::XMLUni::fgXercescDefaultLocale,
0,
0,
&theMemoryManager);
diff --git a/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp b/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp
index 041f430..6e01703 100644
--- a/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp
+++ b/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp
@@ -57,12 +57,12 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER Attributes AttributesType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER ContentHandler ContentHandlerType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DTDHandler DTDHandlerType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER LexicalHandler LexicalHandlerType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+typedef xercesc::Attributes AttributesType;
+typedef xercesc::AttributeList AttributeListType;
+typedef xercesc::ContentHandler ContentHandlerType;
+typedef xercesc::DTDHandler DTDHandlerType;
+typedef xercesc::LexicalHandler LexicalHandlerType;
+typedef xercesc::Locator LocatorType;
diff --git a/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp b/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp
index 804f8ef..8bbdd33 100644
--- a/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp
+++ b/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp
@@ -62,8 +62,8 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER Attributes AttributesType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
+typedef xercesc::Attributes AttributesType;
+typedef xercesc::AttributeList AttributeListType;
diff --git a/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp b/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
index 2d74414..601a48d 100644
--- a/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
+++ b/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
@@ -50,10 +50,10 @@
/*
-typedef XERCES_CPP_NAMESPACE_QUALIFIER ContentHandler ContentHandlerType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DTDHandler DTDHandlerType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER LexicalHandler LexicalHandlerType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER SAX2XMLReader SAX2XMLReaderType;
+typedef xercesc::ContentHandler ContentHandlerType;
+typedef xercesc::DTDHandler DTDHandlerType;
+typedef xercesc::LexicalHandler LexicalHandlerType;
+typedef xercesc::SAX2XMLReader SAX2XMLReaderType;
*/
XALAN_USING_XERCES(ContentHandler)
diff --git a/src/xalanc/XalanTransformer/XalanCompiledStylesheetDefault.hpp b/src/xalanc/XalanTransformer/XalanCompiledStylesheetDefault.hpp
index 5c6a65d..614a78c 100644
--- a/src/xalanc/XalanTransformer/XalanCompiledStylesheetDefault.hpp
+++ b/src/xalanc/XalanTransformer/XalanCompiledStylesheetDefault.hpp
@@ -51,8 +51,8 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER EntityResolver EntityResolverType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER ErrorHandler ErrorHandlerType;
+typedef xercesc::EntityResolver EntityResolverType;
+typedef xercesc::ErrorHandler ErrorHandlerType;
XALAN_USING_XERCES(EntityResolver)
XALAN_USING_XERCES(ErrorHandler)
diff --git a/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp b/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp
index affa919..8d9af66 100644
--- a/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp
+++ b/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp
@@ -194,7 +194,7 @@
{
URISupport::getURLStringFromString(theSystemID, m_uri);
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER XMLException&)
+ catch(const xercesc::XMLException&)
{
// Assume that any exception here relates to get the url from
// the system ID. We'll assume that it's just a fake base identifier
diff --git a/src/xalanc/XalanTransformer/XalanDocumentBuilder.hpp b/src/xalanc/XalanTransformer/XalanDocumentBuilder.hpp
index 6c99d6b..980a679 100644
--- a/src/xalanc/XalanTransformer/XalanDocumentBuilder.hpp
+++ b/src/xalanc/XalanTransformer/XalanDocumentBuilder.hpp
@@ -42,9 +42,9 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER ContentHandler ContentHandlerType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DTDHandler DTDHandlerType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER LexicalHandler LexicalHandlerType;
+typedef xercesc::ContentHandler ContentHandlerType;
+typedef xercesc::DTDHandler DTDHandlerType;
+typedef xercesc::LexicalHandler LexicalHandlerType;
diff --git a/src/xalanc/XalanTransformer/XalanTransformer.hpp b/src/xalanc/XalanTransformer/XalanTransformer.hpp
index fb61a7e..014b4cf 100644
--- a/src/xalanc/XalanTransformer/XalanTransformer.hpp
+++ b/src/xalanc/XalanTransformer/XalanTransformer.hpp
@@ -60,8 +60,8 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER EntityResolver EntityResolverType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER ErrorHandler ErrorHandlerType;
+typedef xercesc::EntityResolver EntityResolverType;
+typedef xercesc::ErrorHandler ErrorHandlerType;
XALAN_USING_XERCES(EntityResolver)
XALAN_USING_XERCES(ErrorHandler)
diff --git a/src/xalanc/XalanTransformer/XercesDOMParsedSource.cpp b/src/xalanc/XalanTransformer/XercesDOMParsedSource.cpp
index 2e17ce4..aea3248 100644
--- a/src/xalanc/XalanTransformer/XercesDOMParsedSource.cpp
+++ b/src/xalanc/XalanTransformer/XercesDOMParsedSource.cpp
@@ -110,7 +110,7 @@
{
URISupport::getURLStringFromString(theSystemID, m_uri);
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER XMLException&)
+ catch(const xercesc::XMLException&)
{
// Assume that any exception here relates to get the url from
// the system ID. We'll assume that it's just a fake base identifier
diff --git a/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp b/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp
index a8e3203..6b50b6a 100644
--- a/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp
+++ b/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp
@@ -42,8 +42,8 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Document DOM_Document_Type;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument DOMDocument_Type;
+typedef xercesc::DOM_Document DOM_Document_Type;
+typedef xercesc::DOMDocument DOMDocument_Type;
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.cpp b/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.cpp
index e3af7da..1e1a94c 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.cpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.cpp
@@ -166,7 +166,7 @@
m_currentElem = elem;
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -192,7 +192,7 @@
m_currentElem = 0;
}
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -221,7 +221,7 @@
cdata(chars, length);
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -243,7 +243,7 @@
append(theXercesNode);
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -269,7 +269,7 @@
append(theXercesNode);
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -293,7 +293,7 @@
append(theXercesNode);
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -322,7 +322,7 @@
append(theXercesNode);
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -348,7 +348,7 @@
append(theXercesNode);
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeTypes.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeTypes.hpp
index cafa2f9..b06ea96 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeTypes.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeTypes.hpp
@@ -56,31 +56,31 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Attr DOM_AttrType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_CharacterData DOM_CharacterDataType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Comment DOM_CommentType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_CDATASection DOM_CDATASectionType;
+typedef xercesc::DOM_Attr DOM_AttrType;
+typedef xercesc::DOM_CharacterData DOM_CharacterDataType;
+typedef xercesc::DOM_Comment DOM_CommentType;
+typedef xercesc::DOM_CDATASection DOM_CDATASectionType;
// These next two have an extra '_' because they collide without it...
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentType DOM_DocumentType_Type;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Document DOM_Document_Type;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentFragment DOM_DocumentFragmentType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DOMImplementation DOM_DOMImplementationType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Element DOM_ElementType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Entity DOM_EntityType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_EntityReference DOM_EntityReferenceType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Node DOM_NodeType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text DOM_TextType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_NamedNodeMap DOM_NamedNodeMapType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_NodeList DOM_NodeListType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Notation DOM_NotationType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_ProcessingInstruction DOM_ProcessingInstructionType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text DOM_TextType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DOMException DOM_DOMExceptionType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER AttrImpl AttrImplType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER ElementImpl ElementImplType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER NodeImpl NodeImplType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER TextImpl TextImplType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMString DOMStringType;
+typedef xercesc::DOM_DocumentType DOM_DocumentType_Type;
+typedef xercesc::DOM_Document DOM_Document_Type;
+typedef xercesc::DOM_DocumentFragment DOM_DocumentFragmentType;
+typedef xercesc::DOM_DOMImplementation DOM_DOMImplementationType;
+typedef xercesc::DOM_Element DOM_ElementType;
+typedef xercesc::DOM_Entity DOM_EntityType;
+typedef xercesc::DOM_EntityReference DOM_EntityReferenceType;
+typedef xercesc::DOM_Node DOM_NodeType;
+typedef xercesc::DOM_Text DOM_TextType;
+typedef xercesc::DOM_NamedNodeMap DOM_NamedNodeMapType;
+typedef xercesc::DOM_NodeList DOM_NodeListType;
+typedef xercesc::DOM_Notation DOM_NotationType;
+typedef xercesc::DOM_ProcessingInstruction DOM_ProcessingInstructionType;
+typedef xercesc::DOM_Text DOM_TextType;
+typedef xercesc::DOM_DOMException DOM_DOMExceptionType;
+typedef xercesc::AttrImpl AttrImplType;
+typedef xercesc::ElementImpl ElementImplType;
+typedef xercesc::NodeImpl NodeImplType;
+typedef xercesc::TextImpl TextImplType;
+typedef xercesc::DOMString DOMStringType;
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesDOM_NodeHack.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesDOM_NodeHack.hpp
index 2c10e64..2f57053 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesDOM_NodeHack.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesDOM_NodeHack.hpp
@@ -54,11 +54,11 @@
*
* @deprecated This class is part of the deprecated Xerces DOM bridge.
*/
-class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_NodeHack : public XERCES_CPP_NAMESPACE_QUALIFIER DOM_Node
+class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_NodeHack : public xercesc::DOM_Node
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Node ParentType;
+ typedef xercesc::DOM_Node ParentType;
XercesDOM_NodeHack(NodeImplType* theImpl = 0);
@@ -79,11 +79,11 @@
-class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_AttrHack : public XERCES_CPP_NAMESPACE_QUALIFIER DOM_Attr
+class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_AttrHack : public xercesc::DOM_Attr
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Attr ParentType;
+ typedef xercesc::DOM_Attr ParentType;
XercesDOM_AttrHack(AttrImplType* theImpl = 0);
@@ -94,11 +94,11 @@
-class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_ElementHack : public XERCES_CPP_NAMESPACE_QUALIFIER DOM_Element
+class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_ElementHack : public xercesc::DOM_Element
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Element ParentType;
+ typedef xercesc::DOM_Element ParentType;
XercesDOM_ElementHack(ElementImplType* theImpl = 0);
@@ -148,11 +148,11 @@
-class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_TextHack : public XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text
+class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_TextHack : public xercesc::DOM_Text
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text ParentType;
+ typedef xercesc::DOM_Text ParentType;
XercesDOM_TextHack(TextImplType* theImpl = 0);
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesDocumentFragmentBridge.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesDocumentFragmentBridge.hpp
index 94ca01d..f6fd84b 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesDocumentFragmentBridge.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesDocumentFragmentBridge.hpp
@@ -56,7 +56,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentFragment DOM_DocumentFragmentType;
+ typedef xercesc::DOM_DocumentFragment DOM_DocumentFragmentType;
XercesDocumentFragmentBridge(
const DOM_DocumentFragmentType& theXercesDOMDocumentFragment,
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesElementBridge.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesElementBridge.hpp
index f8cce5a..8bd040c 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesElementBridge.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesElementBridge.hpp
@@ -62,7 +62,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Element DOM_ElementType;
+ typedef xercesc::DOM_Element DOM_ElementType;
XercesElementBridge(
const DOM_ElementType& theXercesElement,
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesEntityBridge.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesEntityBridge.hpp
index e3a6588..8844cbd 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesEntityBridge.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesEntityBridge.hpp
@@ -56,7 +56,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Entity DOM_EntityType;
+ typedef xercesc::DOM_Entity DOM_EntityType;
XercesEntityBridge(
const DOM_EntityType& theXercesDOMEntity,
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesNamedNodeMapBridge.cpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesNamedNodeMapBridge.cpp
index f193e63..75282dd 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesNamedNodeMapBridge.cpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesNamedNodeMapBridge.cpp
@@ -53,7 +53,7 @@
m_xercesNamedNodeMap(theXercesNamedNodeMap),
m_navigator(theNavigator)
{
- assert(m_xercesNamedNodeMap != (const XERCES_CPP_NAMESPACE_QUALIFIER DOM_NullPtr*)0);
+ assert(m_xercesNamedNodeMap != (const xercesc::DOM_NullPtr*)0);
}
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesNamedNodeMapBridge.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesNamedNodeMapBridge.hpp
index 22f40e6..69a13e4 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesNamedNodeMapBridge.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesNamedNodeMapBridge.hpp
@@ -53,7 +53,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_NamedNodeMap DOM_NamedNodeMapType;
+ typedef xercesc::DOM_NamedNodeMap DOM_NamedNodeMapType;
XercesNamedNodeMapBridge(
const DOM_NamedNodeMapType& theXercesNamedNodeMap,
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesTextBridge.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesTextBridge.hpp
index 4e40ae3..3d9dfd8 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesTextBridge.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesTextBridge.hpp
@@ -55,7 +55,7 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text DOM_TextType;
+ typedef xercesc::DOM_Text DOM_TextType;
XercesTextBridge(
const DOM_TextType& theXercesText,
diff --git a/src/xalanc/XercesParserLiaison/Deprecated/XercesToXalanNodeMap.hpp b/src/xalanc/XercesParserLiaison/Deprecated/XercesToXalanNodeMap.hpp
index 99f8881..9fe8d61 100644
--- a/src/xalanc/XercesParserLiaison/Deprecated/XercesToXalanNodeMap.hpp
+++ b/src/xalanc/XercesParserLiaison/Deprecated/XercesToXalanNodeMap.hpp
@@ -60,8 +60,8 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Node DOM_NodeType;
- typedef XERCES_CPP_NAMESPACE_QUALIFIER NodeImpl NodeImplType;
+ typedef xercesc::DOM_Node DOM_NodeType;
+ typedef xercesc::NodeImpl NodeImplType;
#if defined(XALAN_NO_STD_NAMESPACE)
typedef map<XalanNode*, NodeImplType*, less<XalanNode*> > XalanNodeMapType;
diff --git a/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp b/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp
index b6e4c08..2edbdf3 100644
--- a/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp
+++ b/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp
@@ -130,7 +130,7 @@
// appending to a DOMDocumentFragment.
processAccumulatedText();
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -156,7 +156,7 @@
m_currentElem = elem;
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -182,7 +182,7 @@
m_currentElem = 0;
}
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -211,7 +211,7 @@
cdata(chars, length);
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -228,7 +228,7 @@
append(m_doc->createEntityReference(name));
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -249,7 +249,7 @@
append(m_doc->createTextNode(m_buffer.c_str()));
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -268,7 +268,7 @@
append(m_doc->createProcessingInstruction(target, data));
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -292,7 +292,7 @@
append(m_doc->createComment(data));
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
@@ -313,7 +313,7 @@
append(m_doc->createCDATASection(m_buffer.c_str()));
}
- catch(const XERCES_CPP_NAMESPACE_QUALIFIER DOMException& theException)
+ catch(const xercesc::DOMException& theException)
{
throw XercesDOMException(theException);
}
diff --git a/src/xalanc/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.hpp b/src/xalanc/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.hpp
index 9d48ecb..1a0a525 100644
--- a/src/xalanc/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.hpp
+++ b/src/xalanc/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.hpp
@@ -43,8 +43,8 @@
public:
typedef XalanDOMStringPool ParentType;
- typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLMutex XMLMutexType;
- typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLMutexLock XMLMutexLockType;
+ typedef xercesc::XMLMutex XMLMutexType;
+ typedef xercesc::XMLMutexLock XMLMutexLockType;
explicit
XercesLiaisonXalanDOMStringPool(MemoryManager& theManager);
diff --git a/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp b/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp
index fad2d45..0d68507 100644
--- a/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp
+++ b/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp
@@ -37,11 +37,11 @@
-class XALAN_XERCESPARSERLIAISON_EXPORT XercesNamedNodeMapAttributeList : public XERCES_CPP_NAMESPACE_QUALIFIER AttributeList
+class XALAN_XERCESPARSERLIAISON_EXPORT XercesNamedNodeMapAttributeList : public xercesc::AttributeList
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList ParentType;
+ typedef xercesc::AttributeList ParentType;
explicit
XercesNamedNodeMapAttributeList(const DOMNamedNodeMapType* theMap);
diff --git a/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp b/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp
index 7dcc51d..190b73c 100644
--- a/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp
+++ b/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp
@@ -66,7 +66,7 @@
class XercesDocumentWrapper;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER SAXParseException SAXParseExceptionType;
+typedef xercesc::SAXParseException SAXParseExceptionType;
class XALAN_XERCESPARSERLIAISON_EXPORT XercesParserLiaison :
@@ -76,7 +76,7 @@
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER SAXParser SAXParserType;
+ typedef xercesc::SAXParser SAXParserType;
/**
* Construct a XercesParserLiaison instance.
@@ -673,7 +673,7 @@
m_buildMaps = newState;
}
- typedef XERCES_CPP_NAMESPACE_QUALIFIER XercesDOMParser DOMParserType;
+ typedef xercesc::XercesDOMParser DOMParserType;
protected:
diff --git a/src/xalanc/XercesParserLiaison/XercesWrapperTypes.hpp b/src/xalanc/XercesParserLiaison/XercesWrapperTypes.hpp
index d568d02..66826ba 100644
--- a/src/xalanc/XercesParserLiaison/XercesWrapperTypes.hpp
+++ b/src/xalanc/XercesParserLiaison/XercesWrapperTypes.hpp
@@ -50,26 +50,26 @@
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMAttr DOMAttrType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMCharacterData DOMCharacterDataType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMComment DOMCommentType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMCDATASection DOMCDATASectionType;
+typedef xercesc::DOMAttr DOMAttrType;
+typedef xercesc::DOMCharacterData DOMCharacterDataType;
+typedef xercesc::DOMComment DOMCommentType;
+typedef xercesc::DOMCDATASection DOMCDATASectionType;
// These next two have an extra '_' because they collide without it...
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentType DOMDocumentType_Type;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument DOMDocument_Type;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentFragment DOMDocumentFragmentType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMImplementation DOMImplementationType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMElement DOMElementType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMEntity DOMEntityType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMEntityReference DOMEntityReferenceType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMNode DOMNodeType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMText DOMTextType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap DOMNamedNodeMapType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMNodeList DOMNodeListType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMNotation DOMNotationType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMProcessingInstruction DOMProcessingInstructionType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMText DOMTextType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMException DOMExceptionType;
+typedef xercesc::DOMDocumentType DOMDocumentType_Type;
+typedef xercesc::DOMDocument DOMDocument_Type;
+typedef xercesc::DOMDocumentFragment DOMDocumentFragmentType;
+typedef xercesc::DOMImplementation DOMImplementationType;
+typedef xercesc::DOMElement DOMElementType;
+typedef xercesc::DOMEntity DOMEntityType;
+typedef xercesc::DOMEntityReference DOMEntityReferenceType;
+typedef xercesc::DOMNode DOMNodeType;
+typedef xercesc::DOMText DOMTextType;
+typedef xercesc::DOMNamedNodeMap DOMNamedNodeMapType;
+typedef xercesc::DOMNodeList DOMNodeListType;
+typedef xercesc::DOMNotation DOMNotationType;
+typedef xercesc::DOMProcessingInstruction DOMProcessingInstructionType;
+typedef xercesc::DOMText DOMTextType;
+typedef xercesc::DOMException DOMExceptionType;
typedef XMLSize_t XMLSizeType;
