From 09cb688a9e84c4c1ba74c9ce61036c2c4a61a6e8 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Tue, 17 Nov 2020 13:25:02 +0100 Subject: [PATCH] DPL: workaround cling issue with std::variant --- Framework/Core/include/Framework/InputSpec.h | 4 ++++ Framework/Core/include/Framework/OutputSpec.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Framework/Core/include/Framework/InputSpec.h b/Framework/Core/include/Framework/InputSpec.h index d9e3f3201d66d..2a21f9d161b52 100644 --- a/Framework/Core/include/Framework/InputSpec.h +++ b/Framework/Core/include/Framework/InputSpec.h @@ -17,7 +17,9 @@ #include #include +#if !defined(__CLING__) && !defined(__ROOTCLING__) #include +#endif namespace o2::framework { @@ -57,7 +59,9 @@ struct InputSpec { std::string binding; /// The actual matcher for the input spec. +#if !defined(__CLING__) && !defined(__ROOTCLING__) std::variant matcher; +#endif enum Lifetime lifetime; diff --git a/Framework/Core/include/Framework/OutputSpec.h b/Framework/Core/include/Framework/OutputSpec.h index 8bb008774661e..6f8357c127e37 100644 --- a/Framework/Core/include/Framework/OutputSpec.h +++ b/Framework/Core/include/Framework/OutputSpec.h @@ -14,7 +14,9 @@ #include "Framework/Lifetime.h" #include "Framework/ConcreteDataMatcher.h" +#if !defined(__CLING__) && !defined(__ROOTCLING__) #include +#endif namespace o2::framework { @@ -28,7 +30,9 @@ struct OutputLabel { /// topology. struct OutputSpec { OutputLabel binding; +#if !defined(__CLING__) && !defined(__ROOTCLING__) std::variant matcher; +#endif enum Lifetime lifetime = Lifetime::Timeframe; /// Build a fully qualified tuple for the OutputSpec