Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Boost 1.75 - Add missing headers (algorithm and memory) and update include locations #32943

Merged
merged 5 commits into from
Feb 23, 2021
Merged

Boost 1.75 - Add missing headers (algorithm and memory) and update include locations #32943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d60b42
Add header for boost lower_bound implementation, update deprecated he…
mrodozov Feb 18, 2021
0d1a55e
forgot code format :/
mrodozov Feb 18, 2021
731acab
Merged refs/pull/32943/head from repository cms-sw with cms-merge-topic
mrodozov Feb 18, 2021
044bbc6
add <algorithm> and <memory> from where were missing
mrodozov Feb 18, 2021
4d2f73e
missed one include
mrodozov Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define HcalDbASCIIIO_h

#include <iostream>

#include <memory>
#include "DataFormats/HcalDetId/interface/HcalDetId.h"
#include "CondFormats/HcalObjects/interface/AllObjects.h"
#include "CalibFormats/HcalObjects/interface/HcalCalibrationsSet.h"
Expand Down
2 changes: 1 addition & 1 deletion CaloOnlineTools/HcalOnlineDb/interface/LMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <vector>
#include <cstring>
#include <fstream>

#include <memory>
#include "CaloOnlineTools/HcalOnlineDb/interface/ConfigurationDatabase.hh"
#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
#include "CondFormats/HcalObjects/interface/HcalElectronicsMap.h"
Expand Down
1 change: 1 addition & 0 deletions CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "CondFormats/EcalObjects/interface/EcalMustacheSCParameters.h"
#include <algorithm>

float EcalMustacheSCParameters::sqrtLogClustETuning() const { return sqrtLogClustETuning_; }

Expand Down
1 change: 1 addition & 0 deletions CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "CondFormats/EcalObjects/interface/EcalSCDynamicDPhiParameters.h"
#include <algorithm>

const EcalSCDynamicDPhiParameters::DynamicDPhiParameters* EcalSCDynamicDPhiParameters::dynamicDPhiParameters(
double clustE, double absSeedEta) const {
Expand Down
2 changes: 1 addition & 1 deletion CondTools/RPC/src/RPCLBLinkNameParser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "CondTools/RPC/interface/RPCLBLinkNameParser.h"

#include <sstream>

#include <algorithm>
#include "FWCore/Utilities/interface/Exception.h"

void RPCLBLinkNameParser::parse(std::string const& name, RPCLBLink& lb_link) {
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/L1TRawToDigi/interface/OmtfRpcPacker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define EventFilter_L1TRawToDigi_Omtf_RpcPacker_H

#include <string>

#include <memory>
#include "DataFormats/RPCDigi/interface/RPCDigiCollection.h"
#include "DataFormats/L1TMuon/interface/OMTF/OmtfDataWord64.h"
#include "EventFilter/L1TRawToDigi/interface/OmtfLinkMappingRpc.h"
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/RPCRawToDigi/src/RPCLBPacker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "EventFilter/RPCRawToDigi/interface/RPCLBPacker.h"

#include "FWCore/Utilities/interface/Exception.h"

#include <algorithm>
#include "CondFormats/RPCObjects/interface/RPCInverseLBLinkMap.h"
#include "DataFormats/RPCDigi/interface/RPCDigi.h"

Expand Down
1 change: 1 addition & 0 deletions L1Trigger/RPCTechnicalTrigger/interface/TTUTrackingAlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define TTUTRACKINGALG_H 1

// Include files
#include <memory>
#include "L1Trigger/RPCTechnicalTrigger/interface/TTULogic.h"
#include "L1Trigger/RPCTechnicalTrigger/interface/TTUInput.h"

Expand Down
11 changes: 5 additions & 6 deletions RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowPositionCalc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <cmath>
#include "CommonTools/Utils/interface/DynArray.h"
#include <iterator>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>

#include "vdt/vdtMath.h"

Expand Down Expand Up @@ -69,11 +69,10 @@ void Basic2DGenericPFlowPositionCalc::calculateAndSetPositionActual(reco::PFClus
const auto rh_rawenergy = rhf.energy;
const auto rh_energy = rh_rawenergy * rh_fraction;
#ifdef PF_DEBUG
if
UNLIKELY(edm::isNotFinite(rh_energy)) {
throw cms::Exception("PFClusterAlgo") << "rechit " << refhit.detId() << " has a NaN energy... "
<< "The input of the particle flow clustering seems to be corrupted.";
}
if UNLIKELY (edm::isNotFinite(rh_energy)) {
throw cms::Exception("PFClusterAlgo") << "rechit " << refhit.detId() << " has a NaN energy... "
<< "The input of the particle flow clustering seems to be corrupted.";
}
#endif
cl_energy += rh_energy;
// If time resolution is given, calculated weighted average
Expand Down