From fc08aa7535e8ad6aff36e3c0df4371170e98cb2f Mon Sep 17 00:00:00 2001
From: Walter Lampl <Walter.Lampl@cern.ch>
Date: Mon, 17 Aug 2020 15:07:35 +0200
Subject: [PATCH] StoreGateSvc: Adjust for boost 1.73.0 (boost::bind
namespace). Addresses ATEAM-646
---
Control/StoreGate/StoreGate/StoreGateSvc.icc | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Control/StoreGate/StoreGate/StoreGateSvc.icc b/Control/StoreGate/StoreGate/StoreGateSvc.icc
index 1e7384135fbf..cd865110a464 100644
--- a/Control/StoreGate/StoreGate/StoreGateSvc.icc
+++ b/Control/StoreGate/StoreGate/StoreGateSvc.icc
@@ -14,7 +14,7 @@
#include "AthContainersInterfaces/AuxStore_traits.h"
#include "AthenaKernel/ClassName.h"
#include "CxxUtils/checker_macros.h"
-#include "boost/bind.hpp"
+#include "boost/bind/bind.hpp"
#include <vector>
/// macro to help writing the function calls.
@@ -106,7 +106,8 @@ StoreGateSvc::regFcn ATLAS_NOT_THREAD_SAFE (StatusCode (T::*updFcn)(IOVSVC_CALLB
SG::DataProxy *dp = 0;
const CallBackID c(updFcn,obj);
- IOVSvcCallBackFcn fcn(boost::bind(updFcn,const_cast<T*>(obj),_1,_2));
+ using namespace boost::placeholders;
+ IOVSvcCallBackFcn fcn(boost::bind(updFcn,const_cast<T*>(obj), _1, _2));
bool ret = this->currentStore()->bindHandleToProxyAndRegister
(clid, key, ir, dp, c, fcn, trigger);
@@ -143,7 +144,8 @@ StoreGateSvc::regFcn ATLAS_NOT_THREAD_SAFE (StatusCode (T1::*fcn1)(IOVSVC_CALLBA
{
const CallBackID c1(fcn1, obj1);
const CallBackID c2(fcn2, obj2);
- IOVSvcCallBackFcn fcn( boost::bind(fcn2,const_cast<T2*>(obj2),_1,_2));
+ using namespace boost::placeholders;
+ IOVSvcCallBackFcn fcn( boost::bind(fcn2,const_cast<T2*>(obj2), _1, _2));
_SGXCALL( regFcn, (c1, c2, fcn, trigger), StatusCode::FAILURE );
}
@@ -157,6 +159,7 @@ StoreGateSvc::regFcn ATLAS_NOT_THREAD_SAFE (const std::string& toolName,
const T2* obj2, bool trigger)
{
const CallBackID c2(fcn2, obj2);
+ using namespace boost::placeholders;
IOVSvcCallBackFcn fcn( boost::bind(fcn2,const_cast<T2*>(obj2),_1,_2));
_SGXCALL( regFcn, (toolName, c2, fcn, trigger), StatusCode::FAILURE );
}
--
GitLab