From 09a3a958b5bbe2e037ea175fa6d134a712d9e9aa Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 19:58:07 +0530 Subject: [PATCH 01/17] replaced boost bind --- Fireworks/Core/test/unittest_parameters.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Fireworks/Core/test/unittest_parameters.cc b/Fireworks/Core/test/unittest_parameters.cc index 33d3bb610008d..dfdb6e6e9215f 100644 --- a/Fireworks/Core/test/unittest_parameters.cc +++ b/Fireworks/Core/test/unittest_parameters.cc @@ -13,7 +13,6 @@ // system include files #include #include -#include #include #include @@ -26,8 +25,8 @@ namespace { struct Test : public FWParameterizable { Test() - : m_double(this, "double", boost::bind(&Test::doubleChanged, this, _1)), - m_long(this, "long", boost::bind(&Test::longChanged, this, _1)), + : m_double(this, "double", std::bind(&Test::doubleChanged, this, std::placeholders::_1)), + m_long(this, "long", std::bind(&Test::longChanged, this, std::placeholders::_1)), m_wasChanged(false) {} void doubleChanged(double iValue) { From ff5494206a1498476053868cb098ec5ab18dec2f Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:00:18 +0530 Subject: [PATCH 02/17] Replaced boost bind --- Fireworks/Core/test/unittest_changemanager.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Fireworks/Core/test/unittest_changemanager.cc b/Fireworks/Core/test/unittest_changemanager.cc index 9f1b7b4452ade..307da18357851 100644 --- a/Fireworks/Core/test/unittest_changemanager.cc +++ b/Fireworks/Core/test/unittest_changemanager.cc @@ -12,7 +12,6 @@ // system include files #include -#include #include #include "TClass.h" @@ -96,8 +95,8 @@ BOOST_AUTO_TEST_CASE(changemanager) { //NOTE: have to pass a pointer to the listener else the bind will // create a copy of the listener and the original one will never // 'hear' any signal - item.changed_.connect(boost::bind(&Listener::listen, &listener, _1)); - item.itemChanged_.connect(boost::bind(&ItemListener::listen, &iListener, _1)); + item.changed_.connect(std::bind(&Listener::listen, &listener, std::placeholders::_1)); + item.itemChanged_.connect(std::bind(&ItemListener::listen, &iListener, std::placeholders::_1)); BOOST_CHECK(listener.nHeard_ == 0); BOOST_CHECK(iListener.nHeard_ == 0); From 3a8450ed81591669d1dbcdc9435313cb1b1146b2 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:03:24 +0530 Subject: [PATCH 03/17] Replaced boost bind --- Fireworks/Core/test/unittest_eventitemsmanager.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Fireworks/Core/test/unittest_eventitemsmanager.cc b/Fireworks/Core/test/unittest_eventitemsmanager.cc index 5a38295849748..c3bd00bd1dd18 100644 --- a/Fireworks/Core/test/unittest_eventitemsmanager.cc +++ b/Fireworks/Core/test/unittest_eventitemsmanager.cc @@ -12,7 +12,6 @@ // system include files #include -#include #include #include "TClass.h" @@ -62,7 +61,7 @@ BOOST_AUTO_TEST_CASE(eventitemmanager) { //NOTE: have to pass a pointer to the listener else the bind will // create a copy of the listener and the original one will never // 'hear' any signal - eim.newItem_.connect(boost::bind(&Listener::newItem, &listener, _1)); + eim.newItem_.connect(std::bind(&Listener::newItem, &listener, std::placeholders::_1)); TClass* cls = TClass::GetClass("std::vector"); assert(0 != cls); From 4e147bb5d84b345e3d771010537f887d0dcc37fb Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:05:30 +0530 Subject: [PATCH 04/17] Replaced boost bind --- GeneratorInterface/LHEInterface/plugins/LH5Source.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/GeneratorInterface/LHEInterface/plugins/LH5Source.cc b/GeneratorInterface/LHEInterface/plugins/LH5Source.cc index 02fdc4095dcc0..6e0e6f104bda0 100644 --- a/GeneratorInterface/LHEInterface/plugins/LH5Source.cc +++ b/GeneratorInterface/LHEInterface/plugins/LH5Source.cc @@ -4,7 +4,6 @@ #include #include -#include #include "FWCore/Framework/interface/InputSourceMacros.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -148,13 +147,13 @@ void LH5Source::readEvent_(edm::EventPrincipal& eventPrincipal) { } std::for_each(partonLevel_->weights().begin(), partonLevel_->weights().end(), - boost::bind(&LHEEventProduct::addWeight, product.get(), _1)); + std::bind(&LHEEventProduct::addWeight, product.get(), std::placeholders::_1)); product->setScales(partonLevel_->scales()); product->setNpLO(partonLevel_->npLO()); product->setNpNLO(partonLevel_->npNLO()); std::for_each(partonLevel_->getComments().begin(), partonLevel_->getComments().end(), - boost::bind(&LHEEventProduct::addComment, product.get(), _1)); + std::bind(&LHEEventProduct::addComment, product.get(), std::placeholders::_1)); std::unique_ptr edp(new edm::Wrapper(std::move(product))); eventPrincipal.put(lheProvenanceHelper_.eventProductBranchDescription_, From 4eab9823026fe80beb8da36707f1bc42aec10520 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:06:44 +0530 Subject: [PATCH 05/17] Replaced Boost Bind --- CondCore/CondDB/plugins/RelationalAuthenticationService.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CondCore/CondDB/plugins/RelationalAuthenticationService.cc b/CondCore/CondDB/plugins/RelationalAuthenticationService.cc index e892326549dfb..0eaddaf8e3a8d 100644 --- a/CondCore/CondDB/plugins/RelationalAuthenticationService.cc +++ b/CondCore/CondDB/plugins/RelationalAuthenticationService.cc @@ -16,7 +16,6 @@ #include #include -#include #include "CoralBase/MessageStream.h" @@ -24,9 +23,9 @@ cond::RelationalAuthenticationService::RelationalAuthenticationService::Relation const std::string& key) : coral::Service(key), m_authenticationPath(""), m_db(), m_cache(), m_callbackID(0) { boost::function1 cb( - boost::bind(&cond::RelationalAuthenticationService::RelationalAuthenticationService::setAuthenticationPath, + std::bind(&cond::RelationalAuthenticationService::RelationalAuthenticationService::setAuthenticationPath, this, - boost::placeholders::_1)); + std::placeholders::_1)); coral::Property* pm = dynamic_cast( coral::Context::instance().PropertyManager().property(auth::COND_AUTH_PATH_PROPERTY)); From e3f8111ff2133088fc19b2de4bdcaa93d05b144c Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:08:57 +0530 Subject: [PATCH 06/17] Replaced Boost Bind --- Fireworks/Core/test/unittest_selectionmanager.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Fireworks/Core/test/unittest_selectionmanager.cc b/Fireworks/Core/test/unittest_selectionmanager.cc index 42d0e36d19f9e..33bea67b4a4bc 100644 --- a/Fireworks/Core/test/unittest_selectionmanager.cc +++ b/Fireworks/Core/test/unittest_selectionmanager.cc @@ -12,7 +12,7 @@ // system include files //#include -#include + #define BOOST_TEST_DYN_LINK #define BOOST_TEST_MAIN #include @@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE(selectionmanager) { //NOTE: have to pass a pointer to the listener else the bind will // create a copy of the listener and the original one will never // 'hear' any signal - sm.selectionChanged_.connect(boost::bind(&Listener::listen, &listener, _1)); + sm.selectionChanged_.connect(std::bind(&Listener::listen, &listener, std::placeholders::_1)); reco::TrackCollection fVector; fVector.push_back(reco::Track()); From 0fd49147387fbcdf6b950b4fe9a2e4f2c7858093 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:10:24 +0530 Subject: [PATCH 07/17] Replaced boost bind --- Fireworks/Core/src/FWISpyView.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/Fireworks/Core/src/FWISpyView.cc b/Fireworks/Core/src/FWISpyView.cc index 4b1e9131d6e4b..8fd2c6c2a96fe 100644 --- a/Fireworks/Core/src/FWISpyView.cc +++ b/Fireworks/Core/src/FWISpyView.cc @@ -11,7 +11,6 @@ // // system include files -#include // user include files #include "TGLViewer.h" From 789bb43d51f671b89932cdfa7abf6eb0092b6ad0 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:12:38 +0530 Subject: [PATCH 08/17] replaced boost bind --- DataFormats/EcalDigi/test/EcalDigi_t.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataFormats/EcalDigi/test/EcalDigi_t.cpp b/DataFormats/EcalDigi/test/EcalDigi_t.cpp index a78fe1f339e02..51e8ec67d9e98 100644 --- a/DataFormats/EcalDigi/test/EcalDigi_t.cpp +++ b/DataFormats/EcalDigi/test/EcalDigi_t.cpp @@ -173,7 +173,7 @@ namespace { } // std::for_each(frames.begin(),frames.end(), - // boost::bind(verifyId,boost::bind(&edm::DataFrame::id,_1))); + // std::bind(verifyId,std::bind(&edm::DataFrame::id, std::placeholders::_1))); // same as above.... for (int n = 0; n < int(frames.size()); ++n) { edm::DataFrame df = frames[n]; From b354c0ee15329f80cc72d27ed0805de3de0a24da Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:18:16 +0530 Subject: [PATCH 09/17] Replaced boost bind --- Fireworks/Core/src/FWCompositeParameter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fireworks/Core/src/FWCompositeParameter.cc b/Fireworks/Core/src/FWCompositeParameter.cc index 1ba9df128223d..517a606ef7198 100644 --- a/Fireworks/Core/src/FWCompositeParameter.cc +++ b/Fireworks/Core/src/FWCompositeParameter.cc @@ -78,7 +78,7 @@ void FWCompositeParameter::addTo(FWConfiguration& oTo) const { (*it)->addTo(conf); } // std::for_each(begin(), end(), - // boost::bind(&FWParameterBase::addTo,_1,conf)); + // std::bind(&FWParameterBase::addTo, std::placeholders::_1,conf)); oTo.addKeyValue(name(), conf, true); } From 5b94c7412e5e42605cd008c7227d3cb03b79fde2 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:19:28 +0530 Subject: [PATCH 10/17] Update MCatNLOSource.cc --- GeneratorInterface/MCatNLOInterface/plugins/MCatNLOSource.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/GeneratorInterface/MCatNLOInterface/plugins/MCatNLOSource.cc b/GeneratorInterface/MCatNLOInterface/plugins/MCatNLOSource.cc index fe643fb579795..5f38d9e35e176 100644 --- a/GeneratorInterface/MCatNLOInterface/plugins/MCatNLOSource.cc +++ b/GeneratorInterface/MCatNLOInterface/plugins/MCatNLOSource.cc @@ -7,7 +7,6 @@ #include #include -#include #include "FWCore/Framework/interface/InputSourceMacros.h" #include "FWCore/Framework/interface/MakerMacros.h" From b19ebec31ae5e8dd4f0c7eaacd22c30b8dcfba9b Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:21:02 +0530 Subject: [PATCH 11/17] Replaced boost bind --- CondCore/CondDB/plugins/XMLAuthenticationService.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CondCore/CondDB/plugins/XMLAuthenticationService.cc b/CondCore/CondDB/plugins/XMLAuthenticationService.cc index f8614731682b5..8d835efb699a0 100644 --- a/CondCore/CondDB/plugins/XMLAuthenticationService.cc +++ b/CondCore/CondDB/plugins/XMLAuthenticationService.cc @@ -24,7 +24,6 @@ #include #include -#include #include "CoralBase/MessageStream.h" constexpr char XML_AUTHENTICATION_FILE[] = "authentication.xml"; @@ -78,7 +77,7 @@ const coral::IAuthenticationCredentials& cond::XMLAuthenticationService::DataSou cond::XMLAuthenticationService::XMLAuthenticationService::XMLAuthenticationService(const std::string& key) : coral::Service(key), m_isInitialized(false), m_inputFileName(""), m_data(), m_mutexLock(), m_callbackID(0) { boost::function1 cb( - boost::bind(&cond::XMLAuthenticationService::XMLAuthenticationService::setAuthenticationPath, this, _1)); + std::bind(&cond::XMLAuthenticationService::XMLAuthenticationService::setAuthenticationPath, this, std::placeholders::_1)); coral::Property* pm = dynamic_cast( coral::Context::instance().PropertyManager().property(auth::COND_AUTH_PATH_PROPERTY)); From 1d549db697ecacc502137b491901a2e07e6bebe1 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:22:17 +0530 Subject: [PATCH 12/17] Update CSCStripElectronicsSim.cc --- SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.cc b/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.cc index 8b64fb94bc9a7..008781b0611f5 100644 --- a/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.cc +++ b/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.cc @@ -14,7 +14,6 @@ #include "CLHEP/Units/GlobalPhysicalConstants.h" #include "CLHEP/Units/GlobalSystemOfUnits.h" -#include "boost/bind.hpp" #include #include From 6818c9f727e049eefe78696ebc2a37d1ae6e3bfa Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:23:06 +0530 Subject: [PATCH 13/17] Update CondDBTools.cc --- CondCore/Utilities/src/CondDBTools.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CondCore/Utilities/src/CondDBTools.cc b/CondCore/Utilities/src/CondDBTools.cc index 27e523338ccb7..cf1cce5a50178 100644 --- a/CondCore/Utilities/src/CondDBTools.cc +++ b/CondCore/Utilities/src/CondDBTools.cc @@ -5,7 +5,7 @@ #include "CondCore/CondDB/src/DbCore.h" // #include -#include + #include namespace cond { From 4799fa1aa8ec85589a70863d441a8529ca244dd7 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:24:17 +0530 Subject: [PATCH 14/17] Update Pythia6Service.cc --- GeneratorInterface/Pythia6Interface/src/Pythia6Service.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GeneratorInterface/Pythia6Interface/src/Pythia6Service.cc b/GeneratorInterface/Pythia6Interface/src/Pythia6Service.cc index 98ff2cf883eaa..3c031ee9752ce 100644 --- a/GeneratorInterface/Pythia6Interface/src/Pythia6Service.cc +++ b/GeneratorInterface/Pythia6Interface/src/Pythia6Service.cc @@ -7,7 +7,7 @@ #include #include -#include + #include #include #include From 42e458211a69fd0896a6da736c615760b54a62ce Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:25:15 +0530 Subject: [PATCH 15/17] Update ProfilerServiceTest.cppunit.cc --- PerfTools/Callgrind/test/ProfilerServiceTest.cppunit.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PerfTools/Callgrind/test/ProfilerServiceTest.cppunit.cc b/PerfTools/Callgrind/test/ProfilerServiceTest.cppunit.cc index 2e5b5ddd568ae..aac1898f7d27f 100644 --- a/PerfTools/Callgrind/test/ProfilerServiceTest.cppunit.cc +++ b/PerfTools/Callgrind/test/ProfilerServiceTest.cppunit.cc @@ -4,7 +4,7 @@ #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h" #include -#include + #include #include From af3b51ea9be7287120ae10490dcd8cc119165a3f Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:27:15 +0530 Subject: [PATCH 16/17] Update RPCHistos.cc --- Validation/MuonRPCGeometry/test/RPCHistos.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/Validation/MuonRPCGeometry/test/RPCHistos.cc b/Validation/MuonRPCGeometry/test/RPCHistos.cc index 7f7624e561539..fd3543a23dcdd 100644 --- a/Validation/MuonRPCGeometry/test/RPCHistos.cc +++ b/Validation/MuonRPCGeometry/test/RPCHistos.cc @@ -11,7 +11,6 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "L1Trigger/RPCTrigger/interface/RPCConst.h" #include "FWCore/Utilities/interface/Exception.h" -//#include "boost/bind.hpp" const double ptRanges[RPCConst::m_PT_CODE_MAX+2]= { 0.0, 0.01, From 205ef8dced879641faf325b023c829e01f76b05a Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari <48947123+Purva-Chaudhari@users.noreply.github.com> Date: Tue, 29 Jun 2021 20:32:21 +0530 Subject: [PATCH 17/17] Update VVIObj.cc --- RecoLocalTracker/SiPixelRecHits/src/VVIObj.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoLocalTracker/SiPixelRecHits/src/VVIObj.cc b/RecoLocalTracker/SiPixelRecHits/src/VVIObj.cc index bf662801d69eb..1679cf133ddef 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/VVIObj.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/VVIObj.cc @@ -20,7 +20,7 @@ #include #include -#include + namespace VVIObjDetails { void sincosint(double x, double& sint, double& cint); //! Private version of the cosine and sine integral