From 746412292bdbc8f784e16d3b39b7365e0aceb018 Mon Sep 17 00:00:00 2001
From: Gerhard Raven <gerhard.raven@nikhef.nl>
Date: Tue, 7 Nov 2023 10:10:00 +0100
Subject: [PATCH] deprecate no longer required concat_alternatives
---
GaudiExamples/src/FunctionalAlgorithms/selector.cpp | 4 +---
GaudiFunctional/include/Gaudi/Functional/utilities.h | 6 +++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/GaudiExamples/src/FunctionalAlgorithms/selector.cpp b/GaudiExamples/src/FunctionalAlgorithms/selector.cpp
index 460df88b60..6a8c0eb7c8 100644
--- a/GaudiExamples/src/FunctionalAlgorithms/selector.cpp
+++ b/GaudiExamples/src/FunctionalAlgorithms/selector.cpp
@@ -20,9 +20,7 @@ namespace Gaudi {
: public Functional::FilterPredicate<bool( const Gaudi::Range_<Gaudi::Examples::MyTrack::ConstVector>& )> {
public:
CountSelectedTracks( const std::string& name, ISvcLocator* pSvc )
- : FilterPredicate( name, pSvc,
- { KeyValue{ "InputData", Functional::concat_alternatives( "BogusLocation", "MoreBogus",
- "MyOutTracks" ) } } ) {}
+ : FilterPredicate( name, pSvc, { KeyValue{ "InputData", "MyOutTracks" } } ) {}
StatusCode initialize() override {
StatusCode sc = FilterPredicate::initialize();
diff --git a/GaudiFunctional/include/Gaudi/Functional/utilities.h b/GaudiFunctional/include/Gaudi/Functional/utilities.h
index dd1c992ddd..3db5878c67 100644
--- a/GaudiFunctional/include/Gaudi/Functional/utilities.h
+++ b/GaudiFunctional/include/Gaudi/Functional/utilities.h
@@ -19,13 +19,13 @@
namespace Gaudi::Functional {
// This utility is needed when the inputs of a functional algorithm may be stored in several locations
- inline std::string concat_alternatives( std::initializer_list<std::string> c ) {
+ [[deprecated]] inline std::string concat_alternatives( std::initializer_list<std::string> c ) {
return boost::algorithm::join( c, ":" );
}
template <typename... Strings>
- std::string concat_alternatives( const Strings&... s ) {
- return concat_alternatives( std::initializer_list<std::string>{ s... } );
+ [[deprecated]] std::string concat_alternatives( const Strings&... s ) {
+ return boost::algorithm::join( std::initializer_list<std::string>{ s... }, ":" );
}
[[deprecated( "please use `updateHandleLocation` instead of `Gaudi::Functional::updateHandleLocation`" )]] inline void
--
GitLab