From bd71f5dd74c122ce5f13951f957e9276229c3265 Mon Sep 17 00:00:00 2001
From: Gerhard Raven <gerhard.raven@nikhef.nl>
Date: Mon, 30 Aug 2021 23:39:14 +0200
Subject: [PATCH] changes required for gaudi/Gaudi!1249

---
 .../include/CombKernel/ParticleCombiner.h                 | 5 +++++
 Phys/ParticleCombiners/include/CombKernel/ThOrCombiner.h  | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Phys/ParticleCombiners/include/CombKernel/ParticleCombiner.h b/Phys/ParticleCombiners/include/CombKernel/ParticleCombiner.h
index 8b397f6fd..639d6ab15 100644
--- a/Phys/ParticleCombiners/include/CombKernel/ParticleCombiner.h
+++ b/Phys/ParticleCombiners/include/CombKernel/ParticleCombiner.h
@@ -168,8 +168,13 @@ public:
    */
   template <std::size_t... Is>
   static auto input_names( std::index_sequence<Is...> ) {
+#ifdef GAUDI_FUNCTIONAL_CONSTRUCTOR_USES_TUPLE
+    return std::make_tuple( KeyValue{"Input" + std::to_string( Is + 1 ), ""}...,
+                            KeyValue{"StandardGeometryTop", "/dd/Structure/LHCb"} );
+#else
     return std::array{KeyValue{"Input" + std::to_string( Is + 1 ), ""}...,
                       KeyValue{"StandardGeometryTop", "/dd/Structure/LHCb"}};
+#endif
   }
 
   StatusCode initialize() override {
diff --git a/Phys/ParticleCombiners/include/CombKernel/ThOrCombiner.h b/Phys/ParticleCombiners/include/CombKernel/ThOrCombiner.h
index c9ffcd5eb..fbcd76008 100644
--- a/Phys/ParticleCombiners/include/CombKernel/ThOrCombiner.h
+++ b/Phys/ParticleCombiners/include/CombKernel/ThOrCombiner.h
@@ -420,13 +420,17 @@ namespace ThOr {
 
     template <std::size_t... Is>
     static auto input_names( std::index_sequence<Is...> ) {
+#ifdef GAUDI_FUNCTIONAL_CONSTRUCTOR_USES_TUPLE
+      return std::make_tuple( KeyValue{"InputUniqueIDGenerator", LHCb::UniqueIDGeneratorLocation::Default},
+                              KeyValue{"Input" + std::to_string( Is + 1 ), ""}... );
+#else
       return std::array{KeyValue{"InputUniqueIDGenerator", LHCb::UniqueIDGeneratorLocation::Default},
                         KeyValue{"Input" + std::to_string( Is + 1 ), ""}...};
+#endif
     }
 
     Combiner( const std::string& name, ISvcLocator* pSvcLocator )
-        : base_t{name, pSvcLocator, input_names( std::index_sequence_for<InputTypes...>{} ), {KeyValue{"Output", ""}}} {
-    }
+        : base_t{name, pSvcLocator, input_names( std::index_sequence_for<InputTypes...>{} ), KeyValue{"Output", ""}} {}
 
     StatusCode initialize() override {
       StatusCode sc = base_t::initialize();
-- 
GitLab