From a36e6693da1cf10ff1c402127d8a43c90fba3b46 Mon Sep 17 00:00:00 2001 From: Markus Frank <Markus.Frank@cern.ch> Date: Wed, 15 Mar 2017 16:01:48 +0100 Subject: [PATCH] Group common XML parsers (XMLParsers.h,XMLParsers.cpp). --- DDCore/include/DD4hep/objects/ConditionsInterna.h | 6 +++++- DDCore/src/AlignmentData.cpp | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/DDCore/include/DD4hep/objects/ConditionsInterna.h b/DDCore/include/DD4hep/objects/ConditionsInterna.h index f8a356c12..1b880d85f 100644 --- a/DDCore/include/DD4hep/objects/ConditionsInterna.h +++ b/DDCore/include/DD4hep/objects/ConditionsInterna.h @@ -247,7 +247,11 @@ namespace DD4hep { template x& Condition::bind<x>(); \ template x& Condition::get<x>(); \ template const x& Condition::get<x>() const; \ - }} + } \ + template x& OpaqueDataBlock::bind<x>(); \ + template x& OpaqueDataBlock::bind<x>(const std::string& val); \ + template x& OpaqueDataBlock::set<x> (const std::string& val); \ + } #define DD4HEP_DEFINE_CONDITIONS_TYPE_DUMMY(x) \ namespace DD4hep{namespace Parsers{int parse(x&, const std::string&){return 1;}}} \ diff --git a/DDCore/src/AlignmentData.cpp b/DDCore/src/AlignmentData.cpp index d4fa54bd2..a6fd9e113 100644 --- a/DDCore/src/AlignmentData.cpp +++ b/DDCore/src/AlignmentData.cpp @@ -15,6 +15,7 @@ #include "DD4hep/AlignmentData.h" #include "DD4hep/MatrixHelpers.h" #include "DD4hep/InstanceCount.h" +#include "DD4hep/OpaqueData.h" #include "DD4hep/Primitives.h" // ROOT include files -- GitLab