diff --git a/GeneratorInterface/LHEInterface/plugins/ExternalLHEAsciiDumper.cc b/GeneratorInterface/LHEInterface/plugins/ExternalLHEAsciiDumper.cc index 120a7ee7971fe..443729ca23699 100644 --- a/GeneratorInterface/LHEInterface/plugins/ExternalLHEAsciiDumper.cc +++ b/GeneratorInterface/LHEInterface/plugins/ExternalLHEAsciiDumper.cc @@ -7,7 +7,6 @@ #include #include #include -#include // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" diff --git a/GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc b/GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc index bd5cd4033702e..dae7d67a1d6c0 100644 --- a/GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc +++ b/GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc @@ -31,8 +31,6 @@ Description: [one line class summary] #include #include "tbb/task_arena.h" -#include "boost/bind.hpp" - #include "boost/ptr_container/ptr_deque.hpp" // user include files @@ -184,7 +182,7 @@ void ExternalLHEProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe } 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()); if (nPartonMapping_.empty()) { product->setNpLO(partonLevel_->npLO()); @@ -219,7 +217,7 @@ void ExternalLHEProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe 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)); iEvent.put(std::move(product)); @@ -227,10 +225,10 @@ void ExternalLHEProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe std::unique_ptr product(new LHERunInfoProduct(*runInfo_->getHEPRUP())); std::for_each(runInfo_->getHeaders().begin(), runInfo_->getHeaders().end(), - boost::bind(&LHERunInfoProduct::addHeader, product.get(), _1)); + std::bind(&LHERunInfoProduct::addHeader, product.get(), std::placeholders::_1)); std::for_each(runInfo_->getComments().begin(), runInfo_->getComments().end(), - boost::bind(&LHERunInfoProduct::addComment, product.get(), _1)); + std::bind(&LHERunInfoProduct::addComment, product.get(), std::placeholders::_1)); if (!runInfoProducts_.empty()) { runInfoProducts_.front().mergeProduct(*product); @@ -348,10 +346,10 @@ void ExternalLHEProducer::beginRunProduce(edm::Run& run, edm::EventSetup const& std::unique_ptr product(new LHERunInfoProduct(*runInfo_->getHEPRUP())); std::for_each(runInfo_->getHeaders().begin(), runInfo_->getHeaders().end(), - boost::bind(&LHERunInfoProduct::addHeader, product.get(), _1)); + std::bind(&LHERunInfoProduct::addHeader, product.get(), std::placeholders::_1)); std::for_each(runInfo_->getComments().begin(), runInfo_->getComments().end(), - boost::bind(&LHERunInfoProduct::addComment, product.get(), _1)); + std::bind(&LHERunInfoProduct::addComment, product.get(), std::placeholders::_1)); // keep a copy around in case of merging runInfoProducts_.push_back(new LHERunInfoProduct(*product)); diff --git a/GeneratorInterface/LHEInterface/plugins/LHESource.cc b/GeneratorInterface/LHEInterface/plugins/LHESource.cc index b394922a0688b..fa3362b081866 100644 --- a/GeneratorInterface/LHEInterface/plugins/LHESource.cc +++ b/GeneratorInterface/LHEInterface/plugins/LHESource.cc @@ -4,8 +4,6 @@ #include #include -#include - #include "FWCore/Framework/interface/InputSourceMacros.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/EventPrincipal.h" @@ -147,13 +145,13 @@ void LHESource::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_, diff --git a/GeneratorInterface/LHEInterface/src/LHEReader.cc b/GeneratorInterface/LHEInterface/src/LHEReader.cc index 4fa74aa340b02..d42f4117f2dff 100644 --- a/GeneratorInterface/LHEInterface/src/LHEReader.cc +++ b/GeneratorInterface/LHEInterface/src/LHEReader.cc @@ -8,8 +8,6 @@ #include #include -#include - #include #include @@ -28,8 +26,6 @@ #include "XMLUtils.h" -#include "boost/lexical_cast.hpp" - XERCES_CPP_NAMESPACE_USE namespace lhef { @@ -490,7 +486,7 @@ namespace lhef { std::for_each(handler->headers.begin(), handler->headers.end(), - boost::bind(&LHERunInfo::addHeader, curRunInfo.get(), _1)); + std::bind(&LHERunInfo::addHeader, curRunInfo.get(), std::placeholders::_1)); handler->headers.clear(); } break; diff --git a/GeneratorInterface/LHEInterface/src/LHERunInfo.cc b/GeneratorInterface/LHEInterface/src/LHERunInfo.cc index 47c3ef75f99c3..43507a5a39276 100644 --- a/GeneratorInterface/LHEInterface/src/LHERunInfo.cc +++ b/GeneratorInterface/LHEInterface/src/LHERunInfo.cc @@ -8,8 +8,6 @@ #include #include -#include - #include #include #include