Skip to content

Commit 291a6d5

Browse files
committed
All override keywords added by the clang extras utility cpp11-migrate --add-override.
1 parent 5a5ae00 commit 291a6d5

File tree

879 files changed

+1929
-1929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

879 files changed

+1929
-1929
lines changed

CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class CaloTPGTranscoderULUTs : public edm::ESProducer,
4747

4848
ReturnType produce(const CaloTPGRecord&);
4949

50-
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey& iKey, const edm::IOVSyncValue& iTime, edm::ValidityInterval& oInterval ) {
50+
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey& iKey, const edm::IOVSyncValue& iTime, edm::ValidityInterval& oInterval ) override {
5151
oInterval = edm::ValidityInterval (edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime()); //infinite
5252
}
5353
private:

CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzerYousi.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ class EcalLaserAnalyzerYousi : public edm::EDAnalyzer {
6161

6262

6363
private:
64-
virtual void beginJob();
65-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
66-
virtual void endJob();
64+
virtual void beginJob() override;
65+
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
66+
virtual void endJob() override;
6767

6868
// ----------member data ---------------------------
6969
// Declare histograms and ROOT trees, etc.

CalibCalorimetry/HcalTPGIO/src/HcalLuttoDB.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ class HcalLuttoDB : public edm::EDAnalyzer {
5959
explicit HcalLuttoDB(const edm::ParameterSet&);
6060
~HcalLuttoDB();
6161

62-
virtual void beginJob() ;
63-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
64-
virtual void endJob() ;
62+
virtual void beginJob() override ;
63+
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
64+
virtual void endJob() override ;
6565

6666
private:
6767
void writeoutlut1(HcalDetId id, HcalElectronicsId eid, const std::vector<unsigned short>& lut, std::ostream& os);

CalibMuon/DTCalibration/plugins/DTTPAnalyzer.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class DTTPAnalyzer : public edm::EDAnalyzer {
2525
virtual ~DTTPAnalyzer();
2626

2727
//void beginJob();
28-
void beginRun( const edm::Run& , const edm::EventSetup& );
29-
void analyze( const edm::Event& , const edm::EventSetup& );
30-
void endJob();
28+
void beginRun( const edm::Run& , const edm::EventSetup& ) override;
29+
void analyze( const edm::Event& , const edm::EventSetup& ) override;
30+
void endJob() override;
3131

3232
private:
3333
std::string getHistoName( const DTLayerId& );

CalibTracker/SiPixelIsAliveCalibration/src/SiPixelIsAliveCalibration.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ class SiPixelIsAliveCalibration : public SiPixelOfflineCalibAnalysisBase {
4141
~SiPixelIsAliveCalibration();
4242

4343
void doSetup(const edm::ParameterSet &);
44-
virtual bool doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix);
44+
virtual bool doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix) override;
4545

4646

4747
private:
4848

49-
virtual void calibrationSetup(const edm::EventSetup&) ;
50-
virtual void calibrationEnd() ;
51-
virtual void newDetID(uint32_t detid);
52-
virtual bool checkCorrectCalibrationType();
49+
virtual void calibrationSetup(const edm::EventSetup&) override ;
50+
virtual void calibrationEnd() override ;
51+
virtual void newDetID(uint32_t detid) override;
52+
virtual bool checkCorrectCalibrationType() override;
5353
// ----------member data ---------------------------
5454

5555
std::map<uint32_t,MonitorElement *> bookkeeper_;

CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ class SiStripGainFromCalibTree : public ConditionDBWriter<SiStripApvGain> {
115115

116116

117117
private:
118-
virtual void algoBeginJob (const edm::EventSetup&);
119-
virtual void algoEndJob ();
120-
virtual void algoAnalyze (const edm::Event &, const edm::EventSetup &);
118+
virtual void algoBeginJob (const edm::EventSetup&) override;
119+
virtual void algoEndJob () override;
120+
virtual void algoAnalyze (const edm::Event &, const edm::EventSetup &) override;
121121

122122
void algoAnalyzeTheTree();
123123
void algoComputeMPVandGain();
@@ -129,7 +129,7 @@ class SiStripGainFromCalibTree : public ConditionDBWriter<SiStripApvGain> {
129129
void MakeCalibrationMap();
130130

131131

132-
SiStripApvGain* getNewObject();
132+
SiStripApvGain* getNewObject() override;
133133
edm::Service<TFileService> tfs;
134134

135135
double MinNrEntries;

CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ class SiStripGainFromData : public ConditionDBWriter<SiStripApvGain> {
8787

8888

8989
private:
90-
virtual void algoBeginJob(const edm::EventSetup&) ;
91-
virtual void algoEndJob() ;
92-
virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &);
90+
virtual void algoBeginJob(const edm::EventSetup&) override ;
91+
virtual void algoEndJob() override ;
92+
virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &) override;
9393
// virtual void algoBeginRun(const edm::Event& iEvent, const edm::EventSetup& iSetup);
94-
virtual void algoAnalyze(const edm::Event &, const edm::EventSetup &);
94+
virtual void algoAnalyze(const edm::Event &, const edm::EventSetup &) override;
9595

96-
SiStripApvGain* getNewObject();
96+
SiStripApvGain* getNewObject() override;
9797
DQMStore* dqmStore_;
9898
DQMStore* dqmStore_infile;
9999

CalibTracker/SiStripCommon/plugins/SiStripDCSFilter.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class SiStripDCSFilter : public edm::EDFilter {
1414
~SiStripDCSFilter();
1515

1616
private:
17-
bool filter( edm::Event &, edm::EventSetup const& );
17+
bool filter( edm::Event &, edm::EventSetup const& ) override;
1818
SiStripDCSStatus* dcsStatus_;
1919
};
2020

CalibTracker/SiStripDCS/plugins/TkVoltageMapCreator.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ class TkVoltageMapCreator : public edm::EDAnalyzer {
3434

3535

3636
private:
37-
virtual void beginJob() ;
38-
virtual void beginRun(const edm::Run&, const edm::EventSetup&) ;
39-
virtual void endRun(const edm::Run&, const edm::EventSetup&) ;
40-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
41-
virtual void endJob() ;
37+
virtual void beginJob() override ;
38+
virtual void beginRun(const edm::Run&, const edm::EventSetup&) override ;
39+
virtual void endRun(const edm::Run&, const edm::EventSetup&) override ;
40+
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
41+
virtual void endJob() override ;
4242

4343
// ----------member data ---------------------------
4444

CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ class SiStripHitEffFromCalibTree : public ConditionDBWriter<SiStripBadStrip> {
9696

9797
private:
9898
virtual void algoBeginJob();
99-
virtual void algoEndJob();
100-
virtual void algoAnalyze(const edm::Event& e, const edm::EventSetup& c);
99+
virtual void algoEndJob() override;
100+
virtual void algoAnalyze(const edm::Event& e, const edm::EventSetup& c) override;
101101
void SetBadComponents(int i, int component,SiStripQuality::BadComponent& BC, std::stringstream ssV[4][19], int NBadComponent[4][19][4]);
102102
void makeTKMap();
103103
void makeHotColdMaps();
@@ -110,7 +110,7 @@ class SiStripHitEffFromCalibTree : public ConditionDBWriter<SiStripBadStrip> {
110110
SiStripDetInfoFileReader* reader;
111111
edm::FileInPath FileInPath_;
112112
SiStripQuality* quality_;
113-
SiStripBadStrip* getNewObject();
113+
SiStripBadStrip* getNewObject() override;
114114

115115
TFile* CalibTreeFile;
116116
TTree* CalibTree;

Calibration/HcalAlCaRecoProducers/plugins/PrescalerFHN.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ class PrescalerFHN : public edm::EDFilter {
5050
~PrescalerFHN();
5151

5252
private:
53-
virtual void beginJob() ;
54-
virtual bool filter(edm::Event&, const edm::EventSetup&);
55-
virtual void endJob() ;
53+
virtual void beginJob() override ;
54+
virtual bool filter(edm::Event&, const edm::EventSetup&) override;
55+
virtual void endJob() override ;
5656
// ----------member data ---------------------------
5757

5858
void init(const edm::TriggerResults &,

Calibration/HcalAlCaRecoProducers/src/AlCaHOCalibProducer.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ class AlCaHOCalibProducer : public edm::EDProducer {
182182

183183
private:
184184
void findHOEtaPhi(int iphsect, int& ietaho, int& iphiho);
185-
virtual void beginJob() ;
186-
virtual void produce(edm::Event&, const edm::EventSetup&);
187-
virtual void endJob() ;
185+
virtual void beginJob() override ;
186+
virtual void produce(edm::Event&, const edm::EventSetup&) override;
187+
virtual void endJob() override ;
188188

189189
// ----------member data ---------------------------
190190

Calibration/HcalCalibAlgos/plugins/HcalCorrPFCalculation.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ class HcalCorrPFCalculation : public edm::EDAnalyzer {
4444
public:
4545
HcalCorrPFCalculation(edm::ParameterSet const& conf);
4646
~HcalCorrPFCalculation();
47-
virtual void analyze(edm::Event const& ev, edm::EventSetup const& c);
48-
virtual void beginJob() ;
49-
virtual void endJob() ;
47+
virtual void analyze(edm::Event const& ev, edm::EventSetup const& c) override;
48+
virtual void beginJob() override ;
49+
virtual void endJob() override ;
5050
private:
5151

5252
double RecalibFactor(HcalDetId id);

Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ class ValidIsoTrkCalib : public edm::EDAnalyzer {
7373

7474
private:
7575

76-
virtual void beginJob() ;
77-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
78-
virtual void endJob() ;
76+
virtual void beginJob() override ;
77+
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
78+
virtual void endJob() override ;
7979

8080

8181

Calibration/HcalCalibAlgos/src/HOCalibAnalyzer.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ class HOCalibAnalyzer : public edm::EDAnalyzer {
224224

225225
private:
226226

227-
virtual void beginJob() ;
228-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
229-
virtual void endJob() ;
227+
virtual void beginJob() override ;
228+
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
229+
virtual void endJob() override ;
230230

231231
TFile* theFile;
232232
std::string theRootFileName;

Calibration/HcalCalibAlgos/src/HcalIsoTrkAnalyzer.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ class HcalIsoTrkAnalyzer : public edm::EDAnalyzer {
9898
//double getDistInPlaneSimple(const GlobalPoint caloPoint, const GlobalPoint rechitPoint);
9999

100100
private:
101-
virtual void beginJob() ;
102-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
103-
virtual void endJob() ;
101+
virtual void beginJob() override ;
102+
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
103+
virtual void endJob() override ;
104104

105105
// ----------member data ---------------------------
106106

Calibration/HcalConnectivity/src/HcalCableMapper.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ author Kevin Klapoetke - Minnesota*/
1616
class HcalCableMapper : public edm::EDAnalyzer {
1717
public:
1818
explicit HcalCableMapper(edm::ParameterSet const& conf);
19-
virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
20-
virtual void endJob ();
19+
virtual void analyze(edm::Event const& e, edm::EventSetup const& c) override;
20+
virtual void endJob () override;
2121
//std::string sourceDigi_;
2222
private:
2323
typedef std::vector<HcalQIESample> SampleSet;

CaloOnlineTools/EcalTools/plugins/EcalFEDWithCRCErrorProducer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class EcalFEDWithCRCErrorProducer : public edm::EDProducer
5050
~EcalFEDWithCRCErrorProducer();
5151

5252
private:
53-
virtual void produce(edm::Event&, const edm::EventSetup&);
53+
virtual void produce(edm::Event&, const edm::EventSetup&) override;
5454

5555
// ----------member data ---------------------------
5656

CaloOnlineTools/HcalOnlineDb/src/ConfigurationDatabaseStandardXMLParser.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ XERCES_CPP_NAMESPACE_USE
6161
for (int i=0; i<ITEMELEMENTNAMES; i++)
6262
XMLString::release(&xc_header[i]);
6363
}
64-
virtual void startElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname, const Attributes &attrs);
65-
virtual void endElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname);
66-
virtual void characters(const XMLCh* const chars, const unsigned int length);
67-
virtual void ignorableWhitespace(const XMLCh* chars, const unsigned int length);
64+
virtual void startElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname, const Attributes &attrs) override;
65+
virtual void endElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname) override;
66+
virtual void characters(const XMLCh* const chars, const unsigned int length) override;
67+
virtual void ignorableWhitespace(const XMLCh* chars, const unsigned int length) override;
6868
private:
6969
inline bool cvt2String(const XMLCh* val, std::string& ou) {
7070
if (val==0) return false;

CaloOnlineTools/HcalOnlineDb/src/WriteL1TriggerObjetsXml.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ class WriteL1TriggerObjetsXml : public edm::EDAnalyzer {
5050

5151

5252
private:
53-
virtual void beginJob() ;
54-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
55-
virtual void endJob() ;
53+
virtual void beginJob() override ;
54+
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
55+
virtual void endJob() override ;
5656

5757
// ----------member data ---------------------------
5858
std::string tagname_;

CommonTools/CandAlgos/plugins/CandCollectionExistFilter.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class CandCollectionExistFilter : public EDFilter {
1212
CandCollectionExistFilter(const ParameterSet & cfg) :
1313
src_(cfg.getParameter<InputTag>("src")) { }
1414
private:
15-
bool filter(Event& evt, const EventSetup&) {
15+
bool filter(Event& evt, const EventSetup&) override {
1616
Handle<CandidateView> src;
1717
bool exists = true;
1818
evt.getByLabel(src_, src);

CommonTools/CandAlgos/plugins/CandReducer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class CandReducer : public edm::EDProducer {
2727
~CandReducer();
2828
private:
2929
/// process one evevnt
30-
void produce( edm::Event& evt, const edm::EventSetup& );
30+
void produce( edm::Event& evt, const edm::EventSetup& ) override;
3131
/// label of source candidate collection
3232
edm::InputTag src_;
3333
};

CommonTools/CandAlgos/plugins/CandViewRefMerger.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class CandViewRefMerger : public edm::EDProducer {
2020
produces<std::vector<reco::CandidateBaseRef> >();
2121
}
2222
private:
23-
void produce(edm::Event & evt, const edm::EventSetup &) {
23+
void produce(edm::Event & evt, const edm::EventSetup &) override {
2424
std::auto_ptr<std::vector<reco::CandidateBaseRef> > out(new std::vector<reco::CandidateBaseRef>);
2525
for(std::vector<edm::InputTag>::const_iterator i = src_.begin(); i != src_.end(); ++i) {
2626
edm::Handle<reco::CandidateView> src;

CommonTools/CandAlgos/plugins/ParticleDecayProducer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ParticleDecayProducer : public edm::EDProducer {
1717
~ParticleDecayProducer();
1818

1919
private:
20-
virtual void produce(edm::Event&, const edm::EventSetup&);
20+
virtual void produce(edm::Event&, const edm::EventSetup&) override;
2121
edm::InputTag genCandidates_;
2222
int motherPdgId_;
2323
std::vector<int> daughtersPdgId_;

CommonTools/RecoAlgos/plugins/JetConstituentSelector.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class JetConstituentSelector : public edm::EDFilter {
4646

4747
virtual ~JetConstituentSelector() {}
4848

49-
virtual void beginJob() {}
50-
virtual void endJob() {}
49+
virtual void beginJob() override {}
50+
virtual void endJob() override {}
5151

5252
virtual bool filter(edm::Event& iEvent, const edm::EventSetup& iSetup) override {
5353

CommonTools/UtilAlgos/plugins/StopAfterNEvents.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class StopAfterNEvents : public edm::EDFilter {
66
StopAfterNEvents( const edm::ParameterSet & );
77
~StopAfterNEvents();
88
private:
9-
bool filter( edm::Event &, edm::EventSetup const& );
9+
bool filter( edm::Event &, edm::EventSetup const& ) override;
1010
const int nMax_;
1111
int n_;
1212
const bool verbose_;

CondCore/BeamSpotPlugins/plugins/BeamSpotObjectsPyWrapper.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace cond {
3232
{
3333
// here one can make stuff really complicated...
3434
}
35-
void compute(Class const & it){
35+
void compute(Class const & it) override{
3636
}
3737
private:
3838
};

CondCore/CalibPlugins/plugins/PedestalPyWrapper.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ namespace cond {
7474
std::vector<Value> const & v = allValues();
7575
for (size_t i=0; i< m_what.size(); i++) m_what[i] = v[what.quantity()[i]];
7676
}
77-
void compute(Class const & it){
77+
void compute(Class const & it) override{
7878
for (size_t i=0; i<m_which.size(); ++i) {
7979
if (m_which[i]< int(it.m_pedestals.size()))
8080
for (size_t j=0; j< m_what.size(); ++j) add(m_what[j](it.m_pedestals[m_which[i]]));

CondCore/DBCommon/plugins/BlobStreamingService.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ namespace cond {
2828

2929
virtual ~BlobStreamingService();
3030

31-
boost::shared_ptr<coral::Blob> write( const void* addressOfInputData, Reflex::Type const & classDictionary, bool useCompression=true );
31+
boost::shared_ptr<coral::Blob> write( const void* addressOfInputData, Reflex::Type const & classDictionary, bool useCompression=true ) override;
3232

33-
void read( const coral::Blob& blobData, void* addressOfContainer, Reflex::Type const & classDictionary );
33+
void read( const coral::Blob& blobData, void* addressOfContainer, Reflex::Type const & classDictionary ) override;
3434

3535

3636
private:

CondCore/DBCommon/plugins/FrontierProxy.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ namespace cond{
1616
public:
1717
FrontierProxy();
1818
~FrontierProxy();
19-
void initialize( const DbConnection& connection);
20-
std::string getRealConnectString( const std::string&userconnect ) const;
21-
std::string getRealConnectString( const std::string&userconnect, const std::string& transactionId ) const;
22-
bool isTransactional() const { return false;}
19+
void initialize( const DbConnection& connection) override;
20+
std::string getRealConnectString( const std::string&userconnect ) const override;
21+
std::string getRealConnectString( const std::string&userconnect, const std::string& transactionId ) const override;
22+
bool isTransactional() const override { return false;}
2323

2424
private:
2525
//static unsigned int countslash(const std::string& input);

CondCore/DBCommon/plugins/OracleProxy.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ namespace cond {
44
public:
55
OracleProxy(){}
66
~OracleProxy(){}
7-
void initialize( const DbConnection& ){
7+
void initialize( const DbConnection& ) override{
88
}
9-
std::string getRealConnectString( const std::string &userconnect ) const{ return userconnect;}
10-
std::string getRealConnectString( const std::string &userconnect, const std::string& ) const{ return userconnect;}
11-
bool isTransactional() const { return true;}
9+
std::string getRealConnectString( const std::string &userconnect ) const override{ return userconnect;}
10+
std::string getRealConnectString( const std::string &userconnect, const std::string& ) const override{ return userconnect;}
11+
bool isTransactional() const override { return true;}
1212
};
1313
}//ns cond
1414

0 commit comments

Comments
 (0)