Don't change the functionals to avoid rebase conflicts in key4hep#173

jmcarcell · Mar 15, 2024 · d79d125 · d79d125
1 parent 01b88ba
commit d79d125
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 105 deletions.
diff --git a/test/k4FWCoreTest/options/TestDataHandleUniquePtr.py b/test/k4FWCoreTest/options/TestDataHandleUniquePtr.py
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "Gaudi/Property.h"
-#include "Gaudi/Functional/Consumer.h"
+#include "GaudiAlg/Consumer.h"
 
 #include "edm4hep/MCParticleCollection.h"
 

diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "Gaudi/Property.h"
-#include "Gaudi/Functional/Consumer.h"
+#include "GaudiAlg/Consumer.h"
 
 #include "edm4hep/MCParticleCollection.h"
 #include "edm4hep/SimTrackerHitCollection.h"

diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "Gaudi/Property.h"
-#include "Gaudi/Functional/Producer.h"
+#include "GaudiAlg/Producer.h"
 #include "k4FWCore/BaseClass.h"
 
 #include "edm4hep/MCParticleCollection.h"

diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "Gaudi/Property.h"
-#include "Gaudi/Functional/Producer.h"
+#include "GaudiAlg/Producer.h"
 #include "k4FWCore/BaseClass.h"
 
 #include "edm4hep/MCParticleCollection.h"

diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "Gaudi/Property.h"
-#include "Gaudi/Functional/Transformer.h"
+#include "GaudiAlg/Transformer.h"
 
 #include "edm4hep/MCParticleCollection.h"
 #include "edm4hep/MutableMCParticle.h"

diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "Gaudi/Property.h"
-#include "Gaudi/Functional/Transformer.h"
+#include "GaudiAlg/Transformer.h"
 
 #include "edm4hep/MCParticleCollection.h"
 #include "edm4hep/SimTrackerHitCollection.h"

diff --git a/test/k4FWCoreTest/src/components/TestDataHandleUniquePtr.cpp b/test/k4FWCoreTest/src/components/TestDataHandleUniquePtr.cpp