Skip to content

Commit

Permalink
move away from boost::uint and boost::int
Browse files Browse the repository at this point in the history
  • Loading branch information
davidlange6 committed Sep 24, 2019
1 parent 4c4520c commit f67c449
Show file tree
Hide file tree
Showing 403 changed files with 546 additions and 654 deletions.
1 change: 0 additions & 1 deletion Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "Alignment/CommonAlignment/interface/Alignable.h"
#include <boost/cstdint.hpp>
#include "Alignment/CommonAlignment/interface/Utilities.h"
#include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterStore.h"
#include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterSelector.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "Alignment/CommonAlignment/interface/Alignable.h"
#include <boost/cstdint.hpp>
#include "Alignment/CommonAlignment/interface/AlignableObjectId.h"
#include "Alignment/CommonAlignment/interface/Utilities.h"
#include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterStore.h"
Expand Down
2 changes: 1 addition & 1 deletion CalibFormats/SiStripObjects/interface/NumberOfDevices.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#ifndef CalibFormats_SiStripObjects_NumberOfDevices_H
#define CalibFormats_SiStripObjects_NumberOfDevices_H

#include <boost/cstdint.hpp>
#include <ostream>
#include <sstream>
#include <cstdint>

/**
@class NumberOfDevices
Expand Down
2 changes: 1 addition & 1 deletion CalibFormats/SiStripObjects/interface/SiStripCcu.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "CalibFormats/SiStripObjects/interface/SiStripModule.h"
#include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
#include <boost/cstdint.hpp>
#include <vector>
#include <cstdint>

/**
\class SiStripCcu
Expand Down
2 changes: 1 addition & 1 deletion CalibFormats/SiStripObjects/interface/SiStripDetCabling.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
// Created: Wed Mar 22 12:24:20 CET 2006
#include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
#include <boost/cstdint.hpp>
#include <map>
#include <string>
#include <vector>
#include <cstdint>
class TrackerTopology;
class SiStripDetCabling {
public:
Expand Down
2 changes: 1 addition & 1 deletion CalibFormats/SiStripObjects/interface/SiStripFec.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "CalibFormats/SiStripObjects/interface/SiStripRing.h"
#include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
#include <boost/cstdint.hpp>
#include <vector>
#include <cstdint>

/**
\class SiStripFec
Expand Down
2 changes: 1 addition & 1 deletion CalibFormats/SiStripObjects/interface/SiStripFecCabling.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#include "CalibFormats/SiStripObjects/interface/SiStripFecCrate.h"
#include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
#include <boost/cstdint.hpp>
#include <ostream>
#include <sstream>
#include <vector>
#include <cstdint>

class SiStripFecCabling;

Expand Down
2 changes: 1 addition & 1 deletion CalibFormats/SiStripObjects/interface/SiStripFecCrate.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "CalibFormats/SiStripObjects/interface/SiStripFec.h"
#include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
#include <boost/cstdint.hpp>
#include <vector>
#include <cstdint>

/**
\class SiStripFecCrate
Expand Down
2 changes: 1 addition & 1 deletion CalibFormats/SiStripObjects/interface/SiStripHashedDetId.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
#include <algorithm>
#include <boost/cstdint.hpp>
#include <iomanip>
#include <vector>
#include <cstdint>

class SiStripHashedDetId;
std::ostream &operator<<(std::ostream &os, const SiStripHashedDetId &);
Expand Down
2 changes: 1 addition & 1 deletion CalibFormats/SiStripObjects/interface/SiStripModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

#include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
#include "DataFormats/SiStripCommon/interface/SiStripFecKey.h"
#include <boost/cstdint.hpp>
#include <map>
#include <ostream>
#include <sstream>
#include <vector>
#include <cstdint>

class SiStripModule;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

#include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
#include "DataFormats/Common/interface/Handle.h"
#include <boost/cstdint.hpp>
#include <cmath>
#include <map>
#include <sstream>
#include <vector>
#include <cstdint>

/**
Author: pwing
Expand Down
2 changes: 1 addition & 1 deletion CalibFormats/SiStripObjects/interface/SiStripRing.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "CalibFormats/SiStripObjects/interface/SiStripCcu.h"
#include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
#include <boost/cstdint.hpp>
#include <vector>
#include <cstdint>

/**
\class SiStripRing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include <algorithm>
#include <boost/cstdint.hpp>
#include <iostream>
#include <sstream>
#include <time.h>
#include <vector>
#include <cstdint>

using namespace sistrip;

Expand Down
1 change: 0 additions & 1 deletion CalibMuon/RPCCalibration/interface/RPCFakeCalibration.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
#include "FWCore/ParameterSet/interface/FileInPath.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "boost/cstdint.hpp"
#include <memory>

class RPCCalibSetUp;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "boost/cstdint.hpp"
#include <memory>

class RPCStripNoises;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* Assign barrel pixel modules (defined by name and unit) to links
*/

#include <boost/cstdint.hpp>
#include <vector>

#include "CalibTracker/SiPixelConnectivity/interface/TRange.h"
Expand All @@ -14,6 +13,7 @@ class PixelModuleName;
class PixelBarrelName;
#include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h"
#include "CondFormats/SiPixelObjects/interface/PixelFEDLink.h"
#include <cstdint>

class PixelBarrelLinkMaker {
public:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef PixelEndcapLinkMaker_H
#define PixelEndcapLinkMaker_H

#include <boost/cstdint.hpp>
#include <vector>

#include "CalibTracker/SiPixelConnectivity/interface/TRange.h"
Expand All @@ -10,6 +9,7 @@ class PixelModuleName;
class PixelEndcapName;
#include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h"
#include "CondFormats/SiPixelObjects/interface/PixelFEDLink.h"
#include <cstdint>

class PixelEndcapLinkMaker {
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <string>
#include <iostream>
#include <fstream>
#include <boost/cstdint.hpp>
#include <cstdint>

class SiPixelDetInfoFileReader {
public:
Expand Down
1 change: 0 additions & 1 deletion CalibTracker/SiStripAPVAnalysis/interface/ApvAnalysis.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h"

#include "FWCore/Framework/interface/Event.h"
#include "boost/cstdint.hpp"

//#define DEBUG_INSTANCE_COUNTING

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"

#include "boost/cstdint.hpp"
#include <iostream>
#include <fstream>
#include <sstream>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
#include <string>
#include <iostream>
#include <fstream>
#include <boost/cstdint.hpp>
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include <cstdint>

class SiStripDetInfoFileReader {
public:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef CalibTracker_SiStripCommon_SiStripFedIdListReader_h
#define CalibTracker_SiStripCommon_SiStripFedIdListReader_h

#include <boost/cstdint.hpp>
#include <fstream>
#include <ostream>
#include <vector>
#include <cstdint>

class SiStripFedIdListReader;

Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripCommon/interface/TkDetMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#define CalibTracker_SiStripCommon_TKHistoMap_h

#include <vector>
#include <boost/cstdint.hpp>
#include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
#include <cstdint>

class TrackerTopology;

Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripDCS/interface/SiStripPsuDetIdMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
#include "OnlineDB/SiStripConfigDb/interface/SiStripDbParams.h"
#include "DeviceFactory.h"

#include "boost/cstdint.hpp"
#include <vector>
#include <string>
#include <iostream>
#include <fstream>
#include <sstream>
#include <ostream>
#include <cstdint>

class SiStripConfigDb;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "boost/cstdint.hpp"
#include <memory>

class Phase2TrackerCabling;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "boost/cstdint.hpp"
#include <memory>
#include <cstdint>

class SiStripFedCabling;
class SiStripFedCablingRcd;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "boost/cstdint.hpp"
#include <memory>

class SiStripNoises;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "boost/cstdint.hpp"
#include <memory>

class SiStripPedestals;
Expand Down
1 change: 0 additions & 1 deletion CalibTracker/SiStripESProducers/src/SiStripGainESSource.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
#include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
#include "CondFormats/DataRecord/interface/SiStripApvGainRcd.h"
#include "boost/cstdint.hpp"
#include <iostream>

using namespace sistrip;
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/Alignment/interface/Definitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* \author Chung Khim Lae
*/

#include <boost/cstdint.hpp>

#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
#include "DataFormats/GeometrySurface/interface/TkRotation.h"
Expand All @@ -20,6 +19,7 @@
#include "DataFormats/GeometryVector/interface/Vector3DBase.h"
#include "DataFormats/Math/interface/Error.h"
#include "DataFormats/Math/interface/Vector.h"
#include <cstdint>

namespace align {
typedef uint32_t ID;
Expand Down
10 changes: 5 additions & 5 deletions CondFormats/Calibration/interface/boostTypeObj.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#ifndef BOOSTTYPEOBJ_H
#define BOOSTTYPEOBJ_H
#include "CondFormats/Serialization/interface/Serializable.h"
#include <cstdint>

#include <boost/cstdint.hpp>

class boostTypeObj {
public:
boost::int8_t a;
boost::int16_t b;
boost::uint8_t aa;
boost::uint16_t bb;
int8_t a;
int16_t b;
uint8_t aa;
uint16_t bb;

COND_SERIALIZABLE;
};
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/Calibration/interface/mySiStripNoises.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include <vector>
#include <map>
#include <cstdint>
//#include<iostream>
#include <boost/cstdint.hpp>

//typedef float SiStripNoise;
//typedef bool SiStripDisable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ POOL object to store calibration mode QIE coder parameters for one channel

#include <vector>
#include <algorithm>
#include <boost/cstdint.hpp>
#include <cstdint>

class CastorCalibrationQIECoder {
public:
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/CastorObjects/interface/CastorChannelStatus.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ contains one channel status and corresponding DetId

#include "CondFormats/Serialization/interface/Serializable.h"

#include <boost/cstdint.hpp>
#include <string>
#include <cstdint>

class CastorChannelStatus {
public:
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/CastorObjects/interface/CastorElectronicsMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Modified for CASTOR by L. Mundim

#include <vector>
#include <algorithm>
#include <boost/cstdint.hpp>
#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__REFLEX__)
#include <atomic>
#endif
Expand All @@ -26,6 +25,7 @@ Modified for CASTOR by L. Mundim
#include "DataFormats/HcalDetId/interface/HcalTrigTowerDetId.h"
#include "DataFormats/HcalDetId/interface/CastorElectronicsId.h"
#include "DataFormats/HcalDetId/interface/HcalGenericDetId.h"
#include <cstdint>
//
class CastorElectronicsMap {
public:
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/CastorObjects/interface/CastorGain.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ POOL object to store Gain values 4xCapId
*/

#include "CondFormats/Serialization/interface/Serializable.h"
#include <cstdint>

#include <boost/cstdint.hpp>

class CastorGain {
public:
Expand Down
Loading

0 comments on commit f67c449

Please sign in to comment.