From 5258b1c8e963ee17de40c97cae246bc9da4f1cad Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Tue, 5 Nov 2013 10:46:49 +0000
Subject: [PATCH] - fixed bug seen with clang commented out Property&
operator=(const std::string& val); as this is in conflict with explicit
instantiation (using string) of: template <typename TYPE> Property&
operator=(const TYPE& val);
-> Need checking with other compilers !!
---
DDG4/include/DDG4/ComponentUtils.h | 2 +-
DDG4/src/ComponentUtils.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/DDG4/include/DDG4/ComponentUtils.h b/DDG4/include/DDG4/ComponentUtils.h
index fb62f7a48..a82fffc85 100644
--- a/DDG4/include/DDG4/ComponentUtils.h
+++ b/DDG4/include/DDG4/ComponentUtils.h
@@ -116,7 +116,7 @@ namespace DD4hep {
/// Assignment operator / set new balue
Property& operator=(const char* val);
/// Assignment operator / set new balue
- Property& operator=(const std::string& val);
+ //Property& operator=(const std::string& val);
/// Assignment operator / set new balue
template <typename TYPE> Property& operator=(const TYPE& val);
/// Retrieve value
diff --git a/DDG4/src/ComponentUtils.cpp b/DDG4/src/ComponentUtils.cpp
index 1a939a2a0..3ba567c9d 100644
--- a/DDG4/src/ComponentUtils.cpp
+++ b/DDG4/src/ComponentUtils.cpp
@@ -241,10 +241,10 @@ Property& Property::str(const std::string& input) {
}
/// Assignment operator / set new balue
-Property& Property::operator=(const string& val) {
- this->set<string>(val);
- return *this;
-}
+//Property& Property::operator=(const string& val) {
+// this->set<string>(val);
+// return *this;
+//}
/// Assignment operator / set new balue
Property& Property::operator=(const char* val) {
--
GitLab