summaryrefslogtreecommitdiff
path: root/ACE/ace/XML_Utils
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-08-31 16:05:14 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-08-31 16:05:14 +0200
commit9f459a8db274b0460933b4c6d96b048f3a6f3e50 (patch)
treed61e48b059272e142a80f95a74512f58110c1258 /ACE/ace/XML_Utils
parente46a0add7c9185d85f8ac82621809b5530cd5658 (diff)
downloadATCD-9f459a8db274b0460933b4c6d96b048f3a6f3e50.tar.gz
Make sure impl_ is always initialized to nullptr and use nullptr in some more places
* ACE/ace/XML_Utils/XML_Helper.h: * ACE/ace/XML_Utils/XML_Helper.tpp:
Diffstat (limited to 'ACE/ace/XML_Utils')
-rw-r--r--ACE/ace/XML_Utils/XML_Helper.h2
-rw-r--r--ACE/ace/XML_Utils/XML_Helper.tpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/XML_Utils/XML_Helper.h b/ACE/ace/XML_Utils/XML_Helper.h
index 6cd1c4514b8..71126ac615c 100644
--- a/ACE/ace/XML_Utils/XML_Helper.h
+++ b/ACE/ace/XML_Utils/XML_Helper.h
@@ -81,7 +81,7 @@ namespace XML
private:
bool initialized_ { false };
- XERCES_CPP_NAMESPACE::DOMImplementation *impl_;
+ XERCES_CPP_NAMESPACE::DOMImplementation *impl_ {};
mutable std::unique_ptr<XERCES_CPP_NAMESPACE::XercesDOMParser> parser_;
Resolver *resolver_;
diff --git a/ACE/ace/XML_Utils/XML_Helper.tpp b/ACE/ace/XML_Utils/XML_Helper.tpp
index 4c21a3f585f..86a2beef865 100644
--- a/ACE/ace/XML_Utils/XML_Helper.tpp
+++ b/ACE/ace/XML_Utils/XML_Helper.tpp
@@ -230,8 +230,8 @@ namespace XML
e_handler_ = 0;
}
- this->parser_.reset (0);
- this->impl_ = 0;
+ this->parser_.reset (nullptr);
+ this->impl_ = nullptr;
xercesc::XMLPlatformUtils::Terminate();
}
catch (const XMLException& e)