diff --git a/DDDB/include/Detector/DeStatic.h b/DDDB/include/Detector/DeStatic.h index 27abbee12cfaaf9c495b4faefcccac197349cf6f..50e3e3fc3926f2eddb114c35e37e142fc73ba6cc 100644 --- a/DDDB/include/Detector/DeStatic.h +++ b/DDDB/include/Detector/DeStatic.h @@ -67,7 +67,7 @@ namespace gaudi { /// Type dependent accessor to a named parameter template <typename T> T param(const std::string& nam, bool throw_if_not_present=true) const - { return parameters.param(nam,throw_if_not_present).get<T>(); } + { return parameters.parameter(nam,throw_if_not_present).template get<T>(); } /// Access daughter elements: Static part DeStaticObject* child(DetElement de) const; @@ -117,11 +117,11 @@ namespace gaudi { const ParameterMap::Parameters& params() const; /// Access single parameter - const ParameterMap::Parameter& param(const std::string& nam, bool throw_if_not_present=true) const; + const ParameterMap::Parameter& parameter(const std::string& nam, bool throw_if_not_present=true) const; /// Type dependent accessor to a named parameter template <typename T> T param(const std::string& nam, bool throw_if_not_present=true) const - { return param(nam,throw_if_not_present).get<T>(); } + { return parameter(nam,throw_if_not_present).template get<T>(); } }; } // End namespace gaudi #endif // DETECTOR_DESTATIC_H diff --git a/DDDB/include/Detector/DetectorElement.h b/DDDB/include/Detector/DetectorElement.h index 7af8f493407b1e4fa87ef4acfc542f8ed9337bb5..5e2020702542955b810df29325b22ee6b83c45e2 100644 --- a/DDDB/include/Detector/DetectorElement.h +++ b/DDDB/include/Detector/DetectorElement.h @@ -211,11 +211,11 @@ namespace gaudi { const ParameterMap& params() const { return static_data().parameters; } /// Access single parameter - const Parameter& param(const std::string& nam, bool throw_if_not_present=true) const - { return params().param(nam, throw_if_not_present); } + const Parameter& parameter(const std::string& nam, bool throw_if_not_present=true) const + { return params().parameter(nam, throw_if_not_present); } /// Type dependent accessor to a named parameter template <typename T> T param(const std::string& nam, bool throw_if_not_present=true) const - { return params().param<T>(nam, throw_if_not_present); } + { return params().template param<T>(nam, throw_if_not_present); } /// Access the parent detector element DetElement parent() const { return static_data().detector.parent(); } diff --git a/DDDB/include/Detector/ParameterMap.h b/DDDB/include/Detector/ParameterMap.h index aae11d91a00bf933207dbc827c15308a39777fb6..2c8d731e1225dafd756858d76b61b3d74ad5b00f 100644 --- a/DDDB/include/Detector/ParameterMap.h +++ b/DDDB/include/Detector/ParameterMap.h @@ -85,7 +85,7 @@ namespace gaudi { /// Access parameters set const Parameters& params() const { return m_params; } /// Access single parameter - const Parameter& param(const std::string& nam, bool throw_if_not_present=true) const; + const Parameter& parameter(const std::string& nam, bool throw_if_not_present=true) const; /// Type dependent accessor to a named parameter template <typename T> T param(const std::string& nam, bool throw_if_not_present=true) const; }; diff --git a/DDDB/src/Detector/DeStatic.cpp b/DDDB/src/Detector/DeStatic.cpp index 6a3fb6ec937cb4ce1b8f98440c235169dc2fc911..be1d0880183308e114e6b5ce1cb4d4db32a4569a 100644 --- a/DDDB/src/Detector/DeStatic.cpp +++ b/DDDB/src/Detector/DeStatic.cpp @@ -105,6 +105,6 @@ const ParameterMap::Parameters& DeStatic::params() const { /// Access single parameter const ParameterMap::Parameter& -DeStatic::param(const std::string& nam, bool throw_if_not_present) const { - return access()->parameters.param(nam, throw_if_not_present); +DeStatic::parameter(const std::string& nam, bool throw_if_not_present) const { + return access()->parameters.parameter(nam, throw_if_not_present); } diff --git a/DDDB/src/Detector/ParameterMap.cpp b/DDDB/src/Detector/ParameterMap.cpp index 6559fd5598ae0ef478baf9278738ff4a89e0b43d..779e9d7cf5ebd8f6337a08c1cfb9de4cca1ff3f7 100644 --- a/DDDB/src/Detector/ParameterMap.cpp +++ b/DDDB/src/Detector/ParameterMap.cpp @@ -42,7 +42,7 @@ namespace gaudi { } /// Access single parameter - const ParameterMap::Parameter& ParameterMap::param(const std::string& nam, bool throw_if) const { + const ParameterMap::Parameter& ParameterMap::parameter(const std::string& nam, bool throw_if) const { const auto i = m_params.find(nam); if ( i != m_params.end() ) return (*i).second; @@ -54,7 +54,7 @@ namespace gaudi { /// Type dependent accessor to a named parameter template <typename T> T ParameterMap::param(const std::string& nam, bool throw_if) const { - return param(nam, throw_if).get<T>(); + return parameter(nam, throw_if).template get<T>(); } #define INST(x) template x ParameterMap::Parameter::get() const; \