From 9afe074335bbd2a083bc7d56b247a86243010c22 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Wed, 20 Apr 2022 02:00:11 +0200 Subject: [PATCH 1/2] DPL: work with ROOT master --- Framework/Core/src/RCombinedDS.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Framework/Core/src/RCombinedDS.cxx b/Framework/Core/src/RCombinedDS.cxx index 0c56d967dcc05..a559316688efd 100644 --- a/Framework/Core/src/RCombinedDS.cxx +++ b/Framework/Core/src/RCombinedDS.cxx @@ -42,7 +42,9 @@ double loop on the entries of the two RDataSources. #endif #include +#if __has_include() #include +#endif #include #include From efc5db0eb5ecc2e1adbeb78272e29681f882af91 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Wed, 20 Apr 2022 10:18:34 +0200 Subject: [PATCH 2/2] Update RCombinedDS.cxx --- Framework/Core/src/RCombinedDS.cxx | 3 --- 1 file changed, 3 deletions(-) diff --git a/Framework/Core/src/RCombinedDS.cxx b/Framework/Core/src/RCombinedDS.cxx index a559316688efd..f8ff71f8f6583 100644 --- a/Framework/Core/src/RCombinedDS.cxx +++ b/Framework/Core/src/RCombinedDS.cxx @@ -42,9 +42,6 @@ double loop on the entries of the two RDataSources. #endif #include -#if __has_include() -#include -#endif #include #include