Skip to content

Commit dd7bfcf

Browse files
sawenzelsawenzel
committed
C++11 modernization: use override keyword
 * systematically apply C++11 override keyword * replacement of ClassDef -> ClassDefOverride or ClassDefNV * code is now clean with respect to this coding rule fixes issue AliceO2Group#304
1 parent a146a91 commit dd7bfcf

128 files changed

Lines changed: 556 additions & 556 deletions

File tree

Some content is hidden

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

‎CCDB/include/CCDB/BackendOCDB.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ class BackendOCDB : public Backend {
1818
private:
1919
public:
2020
BackendOCDB();
21-
virtual ~BackendOCDB()= default;
21+
~BackendOCDB() override = default;
2222

2323
/// Prepares an object before transmission to CCDB server
24-
void Pack(const std::string& path, const std::string& key, std::string*& messageString);
24+
void Pack(const std::string& path, const std::string& key, std::string*& messageString) override;
2525

2626
/// Parses an incoming message from the CCDB server and prints the metadata of the included object
27-
void UnPack(std::unique_ptr<FairMQMessage> msg);
27+
void UnPack(std::unique_ptr<FairMQMessage> msg) override;
2828
};
2929
}
3030
}

‎CCDB/include/CCDB/BackendRiak.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ class BackendRiak : public Backend {
2424

2525
public:
2626
BackendRiak();
27-
virtual ~BackendRiak()= default;
27+
~BackendRiak() override = default;
2828

2929
/// Compresses and serializes an object prior to transmission to server
30-
void Pack(const std::string& path, const std::string& key, std::string*& messageString);
30+
void Pack(const std::string& path, const std::string& key, std::string*& messageString) override;
3131

3232
/// Deserializes and uncompresses an incoming message from the CCDB server
33-
void UnPack(std::unique_ptr<FairMQMessage> msg);
33+
void UnPack(std::unique_ptr<FairMQMessage> msg) override;
3434
};
3535
}
3636
}

‎CCDB/include/CCDB/Condition.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Condition : public TObject
5858
ConditionMetaData *metaData, Bool_t owner = kFALSE);
5959

6060
/// Default destructor
61-
virtual ~Condition();
61+
~Condition() override;
6262

6363
/// Set the object identity from an ConditionId
6464
void setId(const ConditionId &id)
@@ -156,10 +156,10 @@ class Condition : public TObject
156156
};
157157

158158
/// Method to compare two CDB objects, used for sorting in ROOT ordered containers
159-
virtual Int_t Compare(const TObject *obj) const;
159+
Int_t Compare(const TObject *obj) const override;
160160

161161
/// Define this class sortable (via the Compare method) for ROOT ordered containers
162-
virtual Bool_t IsSortable() const;
162+
Bool_t IsSortable() const override;
163163

164164
private:
165165
Condition(const Condition &other); // no copy ctor
@@ -170,7 +170,7 @@ class Condition : public TObject
170170
ConditionMetaData *mConditionMetaData; ///< metaData
171171
Bool_t mOwner; ///< Ownership flag
172172

173-
ClassDef(Condition, 1)
173+
ClassDefOverride(Condition, 1)
174174
};
175175
}
176176
}

‎CCDB/include/CCDB/ConditionId.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ConditionId : public TObject
2626

2727
static ConditionId *makeFromString(const TString &idString);
2828

29-
virtual ~ConditionId();
29+
~ConditionId() override;
3030

3131
const IdPath &getPath() const
3232
{
@@ -151,11 +151,11 @@ class ConditionId : public TObject
151151

152152
void print(Option_t *option = "") const;
153153

154-
virtual Int_t Compare(const TObject *obj) const;
154+
Int_t Compare(const TObject *obj) const override;
155155

156-
virtual Bool_t IsSortable() const;
156+
Bool_t IsSortable() const override;
157157

158-
virtual const char *GetName() const
158+
const char *GetName() const override
159159
{
160160
return mPath.getPathString().Data();
161161
}
@@ -167,7 +167,7 @@ class ConditionId : public TObject
167167
Int_t mSubVersion; // subversion
168168
TString mLastStorage; // previous storage place (new, grid, local, dump)
169169

170-
ClassDef(ConditionId, 1)
170+
ClassDefOverride(ConditionId, 1)
171171
};
172172
}
173173
}

‎CCDB/include/CCDB/ConditionMetaData.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class ConditionMetaData : public TObject
2020
ConditionMetaData(const char *responsible, UInt_t beamPeriod = 0, const char *alirootVersion = "",
2121
const char *comment = "");
2222

23-
virtual ~ConditionMetaData();
23+
~ConditionMetaData() override;
2424

2525
void setObjectClassName(const char *name)
2626
{
@@ -92,7 +92,7 @@ class ConditionMetaData : public TObject
9292

9393
TMap mProperties; // list of object specific properties
9494

95-
ClassDef(ConditionMetaData, 1)
95+
ClassDefOverride(ConditionMetaData, 1)
9696
};
9797
}
9898
}

‎CCDB/include/CCDB/ConditionsMQClient.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ namespace CDB {
1818
class ConditionsMQClient : public FairMQDevice {
1919
public:
2020
ConditionsMQClient();
21-
virtual ~ConditionsMQClient();
21+
~ConditionsMQClient() override;
2222

2323
protected:
24-
virtual void InitTask();
25-
virtual void Run();
24+
void InitTask() override;
25+
void Run() override;
2626

2727
private:
2828
int mRunId;

‎CCDB/include/CCDB/ConditionsMQServer.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ class ConditionsMQServer : public ParameterMQServer {
2020
public:
2121
ConditionsMQServer();
2222

23-
virtual ~ConditionsMQServer();
23+
~ConditionsMQServer() override;
2424

25-
virtual void Run();
25+
void Run() override;
2626

27-
virtual void InitTask();
27+
void InitTask() override;
2828

2929
private:
3030
Manager* fCdbManager;

‎CCDB/include/CCDB/FileStorage.h‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,32 @@ class FileStorage : public Storage
2222
friend class FileStorageFactory;
2323

2424
public:
25-
virtual Bool_t isReadOnly() const
25+
Bool_t isReadOnly() const override
2626
{
2727
return mReadOnly;
2828
};
2929

30-
virtual Bool_t hasSubVersion() const
30+
Bool_t hasSubVersion() const override
3131
{
3232
return kFALSE;
3333
};
3434

35-
virtual Bool_t hasConditionType(const char *path) const;
35+
Bool_t hasConditionType(const char *path) const override;
3636

37-
virtual Bool_t idToFilename(const ConditionId &id, TString &filename) const;
37+
Bool_t idToFilename(const ConditionId &id, TString &filename) const override;
3838

39-
virtual void setRetry(Int_t /* nretry */, Int_t /* initsec */);
39+
void setRetry(Int_t /* nretry */, Int_t /* initsec */) override;
4040

4141
protected:
42-
virtual Condition *getCondition(const ConditionId &query);
42+
Condition *getCondition(const ConditionId &query) override;
4343

44-
virtual ConditionId *getConditionId(const ConditionId &query);
44+
ConditionId *getConditionId(const ConditionId &query) override;
4545

46-
virtual TList *getAllEntries(const ConditionId &query);
46+
TList *getAllEntries(const ConditionId &query) override;
4747

48-
virtual Bool_t putCondition(Condition *entry, const char *mirrors = "");
48+
Bool_t putCondition(Condition *entry, const char *mirrors = "") override;
4949

50-
virtual TList *getIdListFromFile(const char *fileName);
50+
TList *getIdListFromFile(const char *fileName) override;
5151

5252
private:
5353
FileStorage(const FileStorage &source);
@@ -56,7 +56,7 @@ class FileStorage : public Storage
5656

5757
FileStorage(const char *dbFile, Bool_t readOnly);
5858

59-
virtual ~FileStorage();
59+
~FileStorage() override;
6060

6161
Bool_t keyNameToId(const char *keyname, IdRunRange &runRange, Int_t &version, Int_t &subVersion);
6262

@@ -69,7 +69,7 @@ class FileStorage : public Storage
6969
// Bool_t getId(const ConditionId& query, ConditionId& result);
7070
ConditionId *getId(const ConditionId &query);
7171

72-
virtual void queryValidFiles();
72+
void queryValidFiles() override;
7373

7474
void getEntriesForLevel0(const ConditionId &query, TList *result);
7575

@@ -78,7 +78,7 @@ class FileStorage : public Storage
7878
TFile *mFile; // FileStorage file
7979
Bool_t mReadOnly; // ReadOnly flag
8080

81-
ClassDef(FileStorage, 0)
81+
ClassDefOverride(FileStorage, 0)
8282
};
8383

8484
/////////////////////////////////////////////////////////////////////
@@ -91,14 +91,14 @@ class FileStorageFactory : public StorageFactory
9191
{
9292

9393
public:
94-
virtual Bool_t validateStorageUri(const char *dbString);
94+
Bool_t validateStorageUri(const char *dbString) override;
9595

96-
virtual StorageParameters *createStorageParameter(const char *dbString);
96+
StorageParameters *createStorageParameter(const char *dbString) override;
9797

9898
protected:
99-
virtual Storage *createStorage(const StorageParameters *param);
99+
Storage *createStorage(const StorageParameters *param) override;
100100

101-
ClassDef(FileStorageFactory, 0)
101+
ClassDefOverride(FileStorageFactory, 0)
102102
};
103103

104104
/////////////////////////////////////////////////////////////////////
@@ -115,7 +115,7 @@ class FileStorageParameters : public StorageParameters
115115

116116
FileStorageParameters(const char *dbPath, Bool_t readOnly = kFALSE);
117117

118-
virtual ~FileStorageParameters();
118+
~FileStorageParameters() override;
119119

120120
const TString &getPathString() const
121121
{
@@ -127,7 +127,7 @@ class FileStorageParameters : public StorageParameters
127127
return mReadOnly;
128128
};
129129

130-
virtual StorageParameters *cloneParam() const;
130+
StorageParameters *cloneParam() const override;
131131

132132
virtual ULong_t getHash() const;
133133

@@ -137,7 +137,7 @@ class FileStorageParameters : public StorageParameters
137137
TString mDBPath; // FileStorage file path name
138138
Bool_t mReadOnly; // ReadOnly flag
139139

140-
ClassDef(FileStorageParameters, 0)
140+
ClassDefOverride(FileStorageParameters, 0)
141141
};
142142
}
143143
}

‎CCDB/include/CCDB/GridStorage.h‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,48 +25,48 @@ class GridStorage : public Storage
2525
friend class GridStorageFactory;
2626

2727
public:
28-
virtual Bool_t isReadOnly() const
28+
Bool_t isReadOnly() const override
2929
{
3030
return kFALSE;
3131
}
3232

33-
virtual Bool_t hasSubVersion() const
33+
Bool_t hasSubVersion() const override
3434
{
3535
return kFALSE;
3636
}
3737

38-
virtual Bool_t hasConditionType(const char *path) const;
38+
Bool_t hasConditionType(const char *path) const override;
3939

40-
virtual Bool_t idToFilename(const ConditionId &id, TString &filename) const;
40+
Bool_t idToFilename(const ConditionId &id, TString &filename) const override;
4141

42-
virtual void setRetry(Int_t nretry, Int_t initsec);
42+
void setRetry(Int_t nretry, Int_t initsec) override;
4343

44-
virtual void setMirrorSEs(const char *mirrors)
44+
void setMirrorSEs(const char *mirrors) override
4545
{
4646
mMirrorSEs = mirrors;
4747
}
4848

49-
virtual const char *getMirrorSEs() const
49+
const char *getMirrorSEs() const override
5050
{
5151
return mMirrorSEs;
5252
}
5353

5454
protected:
55-
virtual Condition *getCondition(const ConditionId &queryId);
55+
Condition *getCondition(const ConditionId &queryId) override;
5656

57-
virtual ConditionId *getConditionId(const ConditionId &queryId);
57+
ConditionId *getConditionId(const ConditionId &queryId) override;
5858

59-
virtual TList *getAllEntries(const ConditionId &queryId);
59+
TList *getAllEntries(const ConditionId &queryId) override;
6060

61-
virtual Bool_t putCondition(Condition *entry, const char *mirrors = "");
61+
Bool_t putCondition(Condition *entry, const char *mirrors = "") override;
6262

63-
virtual TList *getIdListFromFile(const char *fileName);
63+
TList *getIdListFromFile(const char *fileName) override;
6464

6565
private:
6666
GridStorage(const char *gridUrl, const char *user, const char *dbFolder, const char *se, const char *cacheFolder,
6767
Bool_t operateDisconnected, Long64_t cacheSize, Long_t cleanupInterval);
6868

69-
virtual ~GridStorage();
69+
~GridStorage() override;
7070

7171
GridStorage(const GridStorage &db);
7272

@@ -91,7 +91,7 @@ class GridStorage : public Storage
9191

9292
void makeQueryFilter(Int_t firstRun, Int_t lastRun, const ConditionMetaData *md, TString &result) const;
9393

94-
virtual void queryValidFiles();
94+
void queryValidFiles() override;
9595

9696
TString mGridUrl; // GridStorage Url ("alien://aliendb4.cern.ch:9000")
9797
TString mUser; // User
@@ -103,7 +103,7 @@ class GridStorage : public Storage
103103
Long64_t mCacheSize; // local cache size (in bytes)
104104
Long_t mCleanupInterval; // local cache cleanup interval
105105

106-
ClassDef(GridStorage, 0) // access class to a DataBase in an AliEn storage
106+
ClassDefOverride(GridStorage, 0) // access class to a DataBase in an AliEn storage
107107
};
108108

109109
/////////////////////////////////////////////////////////////////////
@@ -116,17 +116,17 @@ class GridStorageFactory : public StorageFactory
116116
{
117117

118118
public:
119-
virtual Bool_t validateStorageUri(const char *gridString);
119+
Bool_t validateStorageUri(const char *gridString) override;
120120

121-
virtual StorageParameters *createStorageParameter(const char *gridString);
121+
StorageParameters *createStorageParameter(const char *gridString) override;
122122

123-
virtual ~GridStorageFactory()
124-
= default;
123+
~GridStorageFactory()
124+
override = default;
125125

126126
protected:
127-
virtual Storage *createStorage(const StorageParameters *param);
127+
Storage *createStorage(const StorageParameters *param) override;
128128

129-
ClassDef(GridStorageFactory, 0)
129+
ClassDefOverride(GridStorageFactory, 0)
130130
};
131131

132132
/////////////////////////////////////////////////////////////////////
@@ -145,7 +145,7 @@ class GridStorageParameters : public StorageParameters
145145
const char *cacheFolder,
146146
Bool_t operateDisconnected, Long64_t cacheSize, Long_t cleanupInterval);
147147

148-
virtual ~GridStorageParameters();
148+
~GridStorageParameters() override;
149149

150150
const TString &GridUrl() const
151151
{
@@ -187,7 +187,7 @@ class GridStorageParameters : public StorageParameters
187187
return mCleanupInterval;
188188
}
189189

190-
virtual StorageParameters *cloneParam() const;
190+
StorageParameters *cloneParam() const override;
191191

192192
virtual ULong_t getHash() const;
193193

@@ -203,7 +203,7 @@ class GridStorageParameters : public StorageParameters
203203
Long64_t mCacheSize; // local cache size (in bytes)
204204
Long_t mCleanupInterval; // local cache cleanup interval
205205

206-
ClassDef(GridStorageParameters, 0)
206+
ClassDefOverride(GridStorageParameters, 0)
207207
};
208208
}
209209
}

0 commit comments

Comments
 (0)