From f4acf7707ab710611218744505e13944c4780c4b Mon Sep 17 00:00:00 2001 From: tmadlener Date: Tue, 12 Sep 2023 13:47:15 +0200 Subject: [PATCH] Use preprocessor to make converter work always --- k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h | 2 ++ k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h b/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h index 8afa8892..14a3f840 100644 --- a/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h +++ b/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h @@ -40,8 +40,10 @@ #include #include +#ifdef EDM4HEP2LCIOCONV_NAMESPACE using EDM4hep2LCIOConv::CollectionsPairVectors; using EDM4hep2LCIOConv::vec_pair; +#endif class EDM4hep2LcioTool : public GaudiTool, virtual public IEDMConverter { public: diff --git a/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp b/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp index 783c0593..56bd444e 100644 --- a/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp +++ b/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp @@ -25,7 +25,9 @@ DECLARE_COMPONENT(EDM4hep2LcioTool); +#ifdef EDM4HEP2LCIOCONV_NAMESPACE using namespace EDM4hep2LCIOConv; +#endif EDM4hep2LcioTool::EDM4hep2LcioTool(const std::string& type, const std::string& name, const IInterface* parent) : GaudiTool(type, name, parent), m_eventDataSvc("EventDataSvc", "EDM4hep2LcioTool") {