From 3767b8c04c83158da6651e85c9153993592b00b4 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Mon, 4 Nov 2013 20:22:16 +0000
Subject: [PATCH] Fix compile error when using Xerces
---
DDG4/src/ComponentUtils.cpp | 3 ++-
DDG4/src/Geant4XMLSetup.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/DDG4/src/ComponentUtils.cpp b/DDG4/src/ComponentUtils.cpp
index ced2d43f9..1a939a2a0 100644
--- a/DDG4/src/ComponentUtils.cpp
+++ b/DDG4/src/ComponentUtils.cpp
@@ -338,6 +338,7 @@ void PropertyManager::dump() const {
DD4HEP_INSTANTIATE_PROPERTY_TYPE1(x); \
DD4HEP_INSTANTIATE_PROPERTY_TYPE1(unsigned x)
+namespace DD4hep {
DD4HEP_INSTANTIATE_PROPERTY_TYPE2(char);
DD4HEP_INSTANTIATE_PROPERTY_TYPE2(short);
DD4HEP_INSTANTIATE_PROPERTY_TYPE2(int);
@@ -351,4 +352,4 @@ DD4HEP_INSTANTIATE_PROPERTY_TYPE1(string);
typedef map<string,int> map_string_int;
DD4HEP_INSTANTIATE_PROPERTY_TYPE(map_string_int);
-
+}
diff --git a/DDG4/src/Geant4XMLSetup.cpp b/DDG4/src/Geant4XMLSetup.cpp
index 7a1fe3191..df45afb10 100644
--- a/DDG4/src/Geant4XMLSetup.cpp
+++ b/DDG4/src/Geant4XMLSetup.cpp
@@ -37,7 +37,7 @@ namespace DD4hep {
vector<XML::Attribute> attrs = props.attributes();
for(vector<XML::Attribute>::iterator i=attrs.begin(); i!=attrs.end(); ++i) {
XML::Attribute a = *i;
- handle[props.attr_name(a)].str(props.attr<string>(a));
+ handle[XML::_toString(props.attr_name(a))].str(props.attr<string>(a));
}
}
template <typename T> static void _setProperties(const T& handle, xml_h& e) {
--
GitLab