diff --git a/Control/AthenaServices/src/MetaDataSvc.cxx b/Control/AthenaServices/src/MetaDataSvc.cxx index b7a084be19577e80a0c410bd3a1ede02123a8167..01efdda18d53e8989005293b03536cc91e6529d6 100644 --- a/Control/AthenaServices/src/MetaDataSvc.cxx +++ b/Control/AthenaServices/src/MetaDataSvc.cxx @@ -29,6 +29,8 @@ #include <vector> #include <sstream> +#include "boost/bind/bind.hpp" + //________________________________________________________________________________ MetaDataSvc::MetaDataSvc(const std::string& name, ISvcLocator* pSvcLocator) : ::AthService(name, pSvcLocator), m_inputDataStore("StoreGateSvc/InputMetaDataStore", name), @@ -383,6 +385,7 @@ void MetaDataSvc::handle(const Incident& inc) { if (inc.type() == "FirstInputFile") { // Register open/close callback actions + using namespace boost::placeholders; Io::bfcn_action_t boa = boost::bind(&MetaDataSvc::rootOpenAction, this, _1,_2); if (m_fileMgr->regAction(boa, Io::OPEN).isFailure()) { ATH_MSG_FATAL("Cannot register ROOT file open action with FileMgr."); diff --git a/Control/AthenaServices/src/MetaDataSvc.h b/Control/AthenaServices/src/MetaDataSvc.h index 5ee9cf87d65d9e0c84b2c8173d62832f3d07066f..b7e6fbc4ea4497e22282f839a64cc5f370646b8f 100644 --- a/Control/AthenaServices/src/MetaDataSvc.h +++ b/Control/AthenaServices/src/MetaDataSvc.h @@ -21,8 +21,6 @@ #include "AthenaKernel/IMetaDataTool.h" #include "AthenaKernel/IMetaDataSvc.h" -#include "boost/bind.hpp" - #include <map> // Forward declarations diff --git a/Control/PileUpComps/src/BkgStreamsCache.cxx b/Control/PileUpComps/src/BkgStreamsCache.cxx index 5544502f045bbeacb7d48dc4f6f52a9db1f05731..e7698a68a50c65932f4445b5b3efc8039e3b2dc4 100644 --- a/Control/PileUpComps/src/BkgStreamsCache.cxx +++ b/Control/PileUpComps/src/BkgStreamsCache.cxx @@ -7,8 +7,7 @@ #include <stdexcept> /*runtime_error*/ #include <string> -#include <boost/bind.hpp> - +#include "boost/bind/bind.hpp" #include "AthenaKernel/IAtRndmGenSvc.h" #include "StoreGate/ActiveStoreSvc.h" @@ -285,6 +284,7 @@ StatusCode BkgStreamsCache::initialize() if (m_collDistrName.value() == "Fixed") { m_f_collDistr = boost::bind(&BkgStreamsCache::collXing, this); + using namespace boost::placeholders; if(m_ignoreBM.value()) { m_f_numberOfBackgroundForBunchCrossing = boost::bind(&BkgStreamsCache::numberOfBkgForBunchCrossingIgnoringBeamIntensity, this, _1); @@ -301,6 +301,7 @@ StatusCode BkgStreamsCache::initialize() m_collXingPoisson = new CLHEP::RandPoisson(*(collEng), m_collXing); // m_f_collDistr will call m_collXingPoisson->fire(m_collXing) USED TO BE boost::bind(&CLHEP::RandPoisson::fire, m_collXingPoisson); m_f_collDistr = boost::bind(&BkgStreamsCache::collXingPoisson, this); + using namespace boost::placeholders; if(m_ignoreBM.value()) { m_f_numberOfBackgroundForBunchCrossing = boost::bind(&BkgStreamsCache::numberOfBkgForBunchCrossingIgnoringBeamIntensity, this, _1);