From fe67a27ef038d8f0433ab993d180e5dcefb8adaf Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Thu, 7 Oct 2021 18:00:02 +0200
Subject: [PATCH] allow coexistence of ODIN classes with and without DataObject
inheritance
---
Event/DAQEvent/include/Event/ODIN.h | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/Event/DAQEvent/include/Event/ODIN.h b/Event/DAQEvent/include/Event/ODIN.h
index fdff703971d..2a42dcd3c6e 100644
--- a/Event/DAQEvent/include/Event/ODIN.h
+++ b/Event/DAQEvent/include/Event/ODIN.h
@@ -97,7 +97,13 @@ namespace LHCb {
}
} // namespace ODINImplementation::details
- namespace ODINImplementation::v7 {
+ namespace
+#ifndef ODIN_WITHOUT_GAUDI
+ ODINImplementation::v7
+#else
+ ODINImplementation::v7_standalone
+#endif
+ {
struct ODIN final
#ifndef ODIN_WITHOUT_GAUDI
@@ -371,6 +377,9 @@ namespace LHCb {
#endif
} // namespace ODINImplementation::v7
+#ifndef ODIN_WITHOUT_GAUDI
using ODIN = ODINImplementation::v7::ODIN;
-
+#else
+ using ODIN = ODINImplementation::v7_standalone::ODIN;
+#endif
} // namespace LHCb
--
GitLab