diff options
Diffstat (limited to 'ACE/ace/XML_Utils/XML_Helper.tpp')
| -rw-r--r-- | ACE/ace/XML_Utils/XML_Helper.tpp | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/ACE/ace/XML_Utils/XML_Helper.tpp b/ACE/ace/XML_Utils/XML_Helper.tpp index bd74e5a923c..78d28b9cfd3 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 { @@ -29,7 +26,7 @@ namespace XML using xercesc::XercesDOMParser; /* template <typename Resolver, typename Error> - XML_Helper<Resolver, Error>::XML_Helper (void) + XML_Helper<Resolver, Error>::XML_Helper () : initialized_ (false) { this->init_parser (); @@ -48,21 +45,21 @@ namespace XML } template <typename Resolver, typename Error> - XML_Helper<Resolver, Error>::~XML_Helper (void) + XML_Helper<Resolver, Error>::~XML_Helper () { this->terminate_parser (); } template <typename Resolver, typename Error> bool - XML_Helper<Resolver, Error>::is_initialized (void) const + XML_Helper<Resolver, Error>::is_initialized () const { - return this->initialized_ == true; + return this->initialized_; } template <typename Resolver, typename Error> void - XML_Helper<Resolver, Error>::init_parser (void) + XML_Helper<Resolver, Error>::init_parser () { if (this->initialized_) return; @@ -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) { |