diff options
Diffstat (limited to 'ACE/ace/XML_Utils/XML_Helper.h')
| -rw-r--r-- | ACE/ace/XML_Utils/XML_Helper.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/ACE/ace/XML_Utils/XML_Helper.h b/ACE/ace/XML_Utils/XML_Helper.h index 001a575b947..39ee3627baa 100644 --- a/ACE/ace/XML_Utils/XML_Helper.h +++ b/ACE/ace/XML_Utils/XML_Helper.h @@ -45,9 +45,9 @@ namespace XML { public: // XML_Helper (void); - XML_Helper (Resolver *resolver = 0, Error_Handler *eh = 0); + XML_Helper (Resolver *resolver = nullptr, Error_Handler *eh = nullptr); - ~XML_Helper (void); + ~XML_Helper (); /// Create a DOM tree XERCES_CPP_NAMESPACE::DOMDocument * @@ -67,27 +67,23 @@ namespace XML bool write_DOM (XERCES_CPP_NAMESPACE::DOMDocument *doc, const ACE_TCHAR *file) const; - bool is_initialized (void) const; + bool is_initialized () const; /// Terminate the parser - void terminate_parser (void); + void terminate_parser (); - Resolver &get_resolver (void); + Resolver &get_resolver (); - Error_Handler &get_error_handler (void); + Error_Handler &get_error_handler (); protected: - /// Intialize the parser - void init_parser (void); + /// Initialize the parser + void init_parser (); private: bool initialized_; XERCES_CPP_NAMESPACE::DOMImplementation *impl_; -#if defined (ACE_HAS_CPP11) mutable std::unique_ptr<XERCES_CPP_NAMESPACE::XercesDOMParser> parser_; -#else - mutable std::auto_ptr<XERCES_CPP_NAMESPACE::XercesDOMParser> parser_; -#endif /* ACE_HAS_CPP11 */ Resolver *resolver_; bool release_resolver_; |