diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-12 12:18:40 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-12 12:18:40 +0100 |
| commit | 8e864aee251976e30ab4dd6ce3451cd4b47d132e (patch) | |
| tree | 410a723cc20418d9d4ee398e16d03f680697f4fe | |
| parent | 35ef2fe97f896f7ba9dbfc71be6a7cc54bdbc48b (diff) | |
| download | ATCD-8e864aee251976e30ab4dd6ce3451cd4b47d132e.tar.gz | |
Removed support for xercesc-2
* ACE/ace/XML_Utils/XML_Helper.tpp:
* ACE/ace/XML_Utils/XSCRT/XML.hpp:
| -rw-r--r-- | ACE/ace/XML_Utils/XML_Helper.tpp | 16 | ||||
| -rw-r--r-- | ACE/ace/XML_Utils/XSCRT/XML.hpp | 6 |
2 files changed, 1 insertions, 21 deletions
diff --git a/ACE/ace/XML_Utils/XML_Helper.tpp b/ACE/ace/XML_Utils/XML_Helper.tpp index a06d1873659..1da87331f03 100644 --- a/ACE/ace/XML_Utils/XML_Helper.tpp +++ b/ACE/ace/XML_Utils/XML_Helper.tpp @@ -9,10 +9,7 @@ #include "xercesc/framework/LocalFileFormatTarget.hpp" #include "xercesc/dom/DOM.hpp" #include "XercesString.h" - -#if XERCES_VERSION_MAJOR == 3 #include "xercesc/dom/DOMLSSerializer.hpp" -#endif namespace XML { @@ -292,7 +289,6 @@ namespace XML try { bool retn; -#if XERCES_VERSION_MAJOR == 3 XERCES_CPP_NAMESPACE::DOMLSSerializer *serializer (impl_->createLSSerializer ()); XERCES_CPP_NAMESPACE::DOMConfiguration *ser_config (serializer->getDomConfig ()); XERCES_CPP_NAMESPACE::DOMLSOutput *output (impl_->createLSOutput ()); @@ -309,18 +305,6 @@ namespace XML output->release (); serializer->release (); return retn; -#else - std::auto_ptr <XERCES_CPP_NAMESPACE::DOMWriter> writer (impl_->createDOMWriter()); - - if (writer->canSetFeature (XMLUni::fgDOMWRTFormatPrettyPrint, - true)) - writer->setFeature (XMLUni::fgDOMWRTFormatPrettyPrint, true); - - std::auto_ptr <xercesc::XMLFormatTarget> ft (new xercesc::LocalFileFormatTarget(ACE_TEXT_ALWAYS_CHAR (file))); - retn = writer->writeNode(ft.get (), *doc); - - return retn; -#endif } catch (const xercesc::XMLException &e) { diff --git a/ACE/ace/XML_Utils/XSCRT/XML.hpp b/ACE/ace/XML_Utils/XSCRT/XML.hpp index ce4b51284b3..6f2079e2852 100644 --- a/ACE/ace/XML_Utils/XSCRT/XML.hpp +++ b/ACE/ace/XML_Utils/XSCRT/XML.hpp @@ -460,15 +460,11 @@ namespace XSCRT { string xns (ns); -#if defined(XERCES_VERSION_MAJOR) && XERCES_VERSION_MAJOR > 2 XMLCh const* p (e.dom_element ()->lookupPrefix (xns.c_str ())); -#else - XMLCh const* p (e.dom_element ()->lookupNamespacePrefix (xns.c_str (), false)); -#endif if (p == 0) { - bool r (e.dom_element ()->isDefaultNamespace (xns.c_str ())); + bool const r (e.dom_element ()->isDefaultNamespace (xns.c_str ())); if (r) { |