From 0606478879383fa925f7b2564f31927955fc4113 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Wed, 14 Feb 2024 17:21:35 +0100
Subject: [PATCH] XML: add std:: when building with tinyXML
---
DDCore/src/XML/DocumentHandler.cpp | 2 +-
DDCore/src/XML/XMLElements.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DDCore/src/XML/DocumentHandler.cpp b/DDCore/src/XML/DocumentHandler.cpp
index f929732a2..21c15af0c 100644
--- a/DDCore/src/XML/DocumentHandler.cpp
+++ b/DDCore/src/XML/DocumentHandler.cpp
@@ -508,7 +508,7 @@ Document DocumentHandler::load(const std::string& fname, UriReader* reader) cons
except("dd4hep:XML","++ Unknown error (TinyXML) while parsing:%s",fname.c_str());
}
}
- catch(exception& e) {
+ catch(std::exception& e) {
printout(ERROR,"DocumentHandler","+++ Exception (TinyXML): parse(path):%s",e.what());
}
if ( result ) {
diff --git a/DDCore/src/XML/XMLElements.cpp b/DDCore/src/XML/XMLElements.cpp
index 9d0ec3f8d..d2ac4360d 100644
--- a/DDCore/src/XML/XMLElements.cpp
+++ b/DDCore/src/XML/XMLElements.cpp
@@ -989,13 +989,13 @@ static unsigned int adler32(unsigned int adler, const XmlChar* xml_buff, size_t
typedef unsigned int (fcn_t)(unsigned int, const XmlChar*, size_t);
unsigned int Handle_t::checksum(unsigned int param, fcn_t fcn) const {
#ifdef DD4HEP_USE_TINYXML
- typedef map<std::string, std::string> StringMap;
+ typedef std::map<std::string, std::string> StringMap;
TiXmlNode* n = Xml(m_node).n;
if ( n ) {
if ( 0 == fcn ) fcn = adler32;
switch (n->Type()) {
case TiXmlNode::ELEMENT: {
- map<std::string,std::string> m;
+ std::map<std::string,std::string> m;
TiXmlElement* e = n->ToElement();
TiXmlAttribute* p=e->FirstAttribute();
for(; p; p=p->Next()) m.emplace(p->Name(),p->Value());
--
GitLab