diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-08-31 13:07:11 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-08-31 13:07:11 +0200 |
| commit | 88ccb57a7f94abfc228ce90d9b6a414b9696ff13 (patch) | |
| tree | aeeac9a3df545fedd04563a2baf2239522113af9 /ACE/ace/XML_Utils | |
| parent | f75799c04412ef1cf29948f3fde889cbb32f0d1f (diff) | |
| download | ATCD-88ccb57a7f94abfc228ce90d9b6a414b9696ff13.tar.gz | |
Layout changes, removed redundant void, no need to check a pointer for non null before calling delete on it
* ACE/ace/DLL_Manager.h:
* ACE/ace/SV_Shared_Memory.cpp:
* ACE/ace/XML_Utils/XML_Error_Handler.h:
* ACE/ace/XML_Utils/XML_Helper.tpp:
* ACE/ace/XML_Utils/XML_Schema_Resolver.h:
Diffstat (limited to 'ACE/ace/XML_Utils')
| -rw-r--r-- | ACE/ace/XML_Utils/XML_Error_Handler.h | 2 | ||||
| -rw-r--r-- | ACE/ace/XML_Utils/XML_Helper.tpp | 16 | ||||
| -rw-r--r-- | ACE/ace/XML_Utils/XML_Schema_Resolver.h | 6 |
3 files changed, 11 insertions, 13 deletions
diff --git a/ACE/ace/XML_Utils/XML_Error_Handler.h b/ACE/ace/XML_Utils/XML_Error_Handler.h index b1ddc81d4e1..a0071800f3a 100644 --- a/ACE/ace/XML_Utils/XML_Error_Handler.h +++ b/ACE/ace/XML_Utils/XML_Error_Handler.h @@ -42,7 +42,7 @@ namespace XML void fatalError(const SAXParseException& toCatch) override; void resetErrors() override; bool getErrors () const; - private : + private: XML_Error_Handler (const XML_Error_Handler&) = delete; XML_Error_Handler& operator= (const XML_Error_Handler&) = delete; XML_Error_Handler (XML_Error_Handler&&) = delete; diff --git a/ACE/ace/XML_Utils/XML_Helper.tpp b/ACE/ace/XML_Utils/XML_Helper.tpp index b8e6bd7d6a6..37f630c7b3b 100644 --- a/ACE/ace/XML_Utils/XML_Helper.tpp +++ b/ACE/ace/XML_Utils/XML_Helper.tpp @@ -200,8 +200,7 @@ namespace XML errText, maxChars)) { - char* message = - XMLString::transcode (errText); + char* message = XMLString::transcode (errText); ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); } return 0; @@ -224,20 +223,20 @@ namespace XML template <typename Resolver, typename Error> void - XML_Helper<Resolver, Error>::terminate_parser (void) + XML_Helper<Resolver, Error>::terminate_parser () { if (!this->initialized_) return; try { - if (release_resolver_ && resolver_) + if (release_resolver_) { delete resolver_; resolver_ = 0; } - if (release_e_handler_ && e_handler_) + if (release_e_handler_) { delete e_handler_; e_handler_ = 0; @@ -249,8 +248,7 @@ namespace XML } catch (const XMLException& e) { - char* message = - XMLString::transcode (e.getMessage()); + char* message = XMLString::transcode (e.getMessage()); ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); throw; } @@ -261,7 +259,7 @@ namespace XML template <typename Resolver, typename Error> Resolver & - XML_Helper<Resolver, Error>::get_resolver (void) + XML_Helper<Resolver, Error>::get_resolver () { if (!this->resolver_) throw std::exception (); @@ -271,7 +269,7 @@ namespace XML template <typename Resolver, typename Error> Error & - XML_Helper<Resolver, Error>::get_error_handler (void) + XML_Helper<Resolver, Error>::get_error_handler () { if (!this->e_handler_) throw std::exception (); diff --git a/ACE/ace/XML_Utils/XML_Schema_Resolver.h b/ACE/ace/XML_Utils/XML_Schema_Resolver.h index 9b72a09a002..d073425c98a 100644 --- a/ACE/ace/XML_Utils/XML_Schema_Resolver.h +++ b/ACE/ace/XML_Utils/XML_Schema_Resolver.h @@ -76,7 +76,7 @@ namespace XML Basic_Resolver (const ACE_TCHAR *path); XMLCh* operator() (const XMLCh *const publicId, - const XMLCh *const systemId) const; + const XMLCh *const systemId) const; XStr path_; }; @@ -92,10 +92,10 @@ namespace XML const ACE_TCHAR *path); void add_path (const ACE_TCHAR *variable, - const ACE_TCHAR *path); + const ACE_TCHAR *path); XMLCh* operator() (const XMLCh *const publicId, - const XMLCh *const systemId) const; + const XMLCh *const systemId) const; std::vector<XStr> paths_; }; |