Skip to content

Commit 5bc31cf

Browse files
SAnsellSAnsell
committed
Update of override
1 parent 43721fa commit 5bc31cf

File tree

638 files changed

+2736
-2740
lines changed

Some content is hidden

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

638 files changed

+2736
-2740
lines changed

‎Model/ESSBeam/beerInc/BEER.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class BEER : public attachSystem::CopiedComp
188188
BEER(const std::string&);
189189
BEER(const BEER&);
190190
BEER& operator=(const BEER&);
191-
~BEER();
191+
~BEER() override;
192192

193193
void buildIsolated(Simulation&,const int);
194194
void build(Simulation&,const GuideItem&,

‎Model/ESSBeam/bifrostInc/BIFROST.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class BIFROST : public attachSystem::CopiedComp
193193
BIFROST(const std::string&);
194194
BIFROST(const BIFROST&);
195195
BIFROST& operator=(const BIFROST&);
196-
~BIFROST();
196+
~BIFROST() override;
197197

198198
void build(Simulation&,const GuideItem&,
199199
const Bunker&,const int);

‎Model/ESSBeam/commonInc/EssHut.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class EssHut :
6565
int feMat; ///< Fe layer material
6666
int concMat; ///< Second layer material
6767

68-
void populate(const FuncDataBase&);
68+
void populate(const FuncDataBase&) override;
6969
void createSurfaces();
7070
void createObjects(Simulation&);
7171
void createLinks();
@@ -75,11 +75,11 @@ class EssHut :
7575
EssHut(const std::string&);
7676
EssHut(const EssHut&);
7777
EssHut& operator=(const EssHut&);
78-
virtual ~EssHut();
78+
~EssHut() override;
7979

8080
using FixedComp::createAll;
8181
void createAll(Simulation&,const attachSystem::FixedComp&,
82-
const long int);
82+
const long int) override;
8383

8484
};
8585

‎Model/ESSBeam/cspecInc/CSPEC.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class CSPEC : public attachSystem::CopiedComp
111111
CSPEC(const std::string&);
112112
CSPEC(const CSPEC&);
113113
CSPEC& operator=(const CSPEC&);
114-
~CSPEC();
114+
~CSPEC() override;
115115

116116
void build(Simulation&,const GuideItem&,
117117
const Bunker&,const int);

‎Model/ESSBeam/dreamInc/DREAM.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class DREAM : public attachSystem::CopiedComp
159159
DREAM(const std::string&);
160160
DREAM(const DREAM&);
161161
DREAM& operator=(const DREAM&);
162-
~DREAM() =default;
162+
~DREAM() override =default;
163163

164164
void build(Simulation&,const GuideItem&,
165165
const Bunker&,const int);

‎Model/ESSBeam/estiaInc/ESTIA.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class ESTIA : public attachSystem::CopiedComp
105105
ESTIA(const std::string&);
106106
ESTIA(const ESTIA&);
107107
ESTIA& operator=(const ESTIA&);
108-
~ESTIA();
108+
~ESTIA() override;
109109

110110
void build(Simulation&,const GuideItem&,
111111
const Bunker&,const int);

‎Model/ESSBeam/freiaInc/FREIA.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class FREIA : public attachSystem::CopiedComp
185185
FREIA(const std::string&);
186186
FREIA(const FREIA&);
187187
FREIA& operator=(const FREIA&);
188-
~FREIA();
188+
~FREIA() override;
189189

190190
void buildIsolated(Simulation&,const int);
191191
void build(Simulation&,const GuideItem&,

‎Model/ESSBeam/heimdalInc/HEIMDAL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ class HEIMDAL : public attachSystem::CopiedComp
168168
HEIMDAL(const std::string&);
169169
HEIMDAL(const HEIMDAL&);
170170
HEIMDAL& operator=(const HEIMDAL&);
171-
~HEIMDAL();
171+
~HEIMDAL() override;
172172

173173
void buildIsolated(Simulation&,const int);
174174
void build(Simulation&,const GuideItem&,

‎Model/ESSBeam/lokiInc/LOKI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ class LOKI : public attachSystem::CopiedComp
168168
LOKI(const std::string&);
169169
LOKI(const LOKI&);
170170
LOKI& operator=(const LOKI&);
171-
~LOKI();
171+
~LOKI() override;
172172

173173
void buildIsolated(Simulation&,const int);
174174
void build(Simulation&,const GuideItem&,

‎Model/ESSBeam/lokiInc/VacTank.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class VacTank :
5757
int wallMat; ///< Material for walls
5858
int windowMat; ///< Material for window
5959

60-
void populate(const FuncDataBase&);
60+
void populate(const FuncDataBase&) override;
6161
void createSurfaces();
6262
void createLinks();
6363
void createObjects(Simulation&);
@@ -67,11 +67,11 @@ class VacTank :
6767
VacTank(const std::string&);
6868
VacTank(const VacTank&);
6969
VacTank& operator=(const VacTank&);
70-
~VacTank();
70+
~VacTank() override;
7171

7272
using FixedComp::createAll;
7373
void createAll(Simulation&,const attachSystem::FixedComp&,
74-
const long int);
74+
const long int) override;
7575

7676
};
7777

‎Model/ESSBeam/magicInc/MAGIC.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class MAGIC : public attachSystem::CopiedComp
196196
MAGIC(const std::string&);
197197
MAGIC(const MAGIC&);
198198
MAGIC& operator=(const MAGIC&);
199-
~MAGIC();
199+
~MAGIC() override;
200200

201201
void buildIsolated(Simulation&,const int);
202202
void build(Simulation&,const GuideItem&,const Bunker&,const int);

‎Model/ESSBeam/miraclesInc/MIRACLES.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class MIRACLES : public attachSystem::CopiedComp
172172
MIRACLES(const std::string&);
173173
MIRACLES(const MIRACLES&);
174174
MIRACLES& operator=(const MIRACLES&);
175-
~MIRACLES();
175+
~MIRACLES() override;
176176

177177
void buildIsolated(Simulation&,const int);
178178

‎Model/ESSBeam/nmxInc/NMX.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class NMX : public attachSystem::CopiedComp
117117
NMX(const std::string&);
118118
NMX(const NMX&);
119119
NMX& operator=(const NMX&);
120-
~NMX();
120+
~NMX() override;
121121

122122
void build(Simulation&,const GuideItem&,
123123
const Bunker&,const int);

‎Model/ESSBeam/nnbarInc/DetectorChamber.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class DetectorChamber :
6565
int feMat; ///< Fe layer material
6666
int concMat; ///< Second layer material
6767

68-
void populate(const FuncDataBase&);
68+
void populate(const FuncDataBase&) override;
6969
void createSurfaces();
7070
void createObjects(Simulation&);
7171
void createLinks();
@@ -75,11 +75,11 @@ class DetectorChamber :
7575
DetectorChamber(const std::string&);
7676
DetectorChamber(const DetectorChamber&);
7777
DetectorChamber& operator=(const DetectorChamber&);
78-
virtual ~DetectorChamber();
78+
~DetectorChamber() override;
7979

8080
using FixedComp::createAll;
8181
void createAll(Simulation&,const attachSystem::FixedComp&,
82-
const long int);
82+
const long int) override;
8383

8484
};
8585

‎Model/ESSBeam/nnbarInc/NNBAR.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class NNBAR : public attachSystem::CopiedComp
124124
NNBAR(const std::string&);
125125
NNBAR(const NNBAR&);
126126
NNBAR& operator=(const NNBAR&);
127-
~NNBAR();
127+
~NNBAR() override;
128128

129129
void buildIsolated(Simulation&,const int);
130130
void build(Simulation&,const GuideItem&,

‎Model/ESSBeam/odinInc/Hut.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ class Hut :
7575
int concMat; ///< Second layer material
7676
int wallMat; ///< Second layer material
7777

78-
void populate(const FuncDataBase&);
79-
void createUnitVector(const attachSystem::FixedComp&,const long int);
78+
void populate(const FuncDataBase&) override;
79+
void createUnitVector(const attachSystem::FixedComp&,const long int) override;
8080
void createSurfaces();
8181
void createObjects(Simulation&);
8282
void createLinks();
@@ -86,11 +86,11 @@ class Hut :
8686
Hut(const std::string&);
8787
Hut(const Hut&);
8888
Hut& operator=(const Hut&);
89-
virtual ~Hut();
89+
~Hut() override;
9090

9191
using FixedComp::createAll;
9292
void createAll(Simulation&,const attachSystem::FixedComp&,
93-
const long int);
93+
const long int) override;
9494

9595
};
9696

‎Model/ESSBeam/odinInc/ODIN.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ class ODIN : public attachSystem::CopiedComp
231231
ODIN(const std::string&);
232232
ODIN(const ODIN&);
233233
ODIN& operator=(const ODIN&);
234-
~ODIN();
234+
~ODIN() override;
235235

236236
void build(Simulation&,const GuideItem&,
237237
const Bunker&,const int);

‎Model/ESSBeam/odinInc/RentrantBS.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class RentrantBS :
6969
int concMat; ///< Second layer material
7070

7171

72-
void populate(const FuncDataBase&);
72+
void populate(const FuncDataBase&) override;
7373
void createSurfaces();
7474
void createObjects(Simulation&);
7575
void createLinks();
@@ -79,11 +79,11 @@ class RentrantBS :
7979
RentrantBS(const std::string&);
8080
RentrantBS(const RentrantBS&);
8181
RentrantBS& operator=(const RentrantBS&);
82-
virtual ~RentrantBS();
82+
~RentrantBS() override;
8383

8484
using FixedComp::createAll;
8585
void createAll(Simulation&,const attachSystem::FixedComp&,
86-
const long int);
86+
const long int) override;
8787

8888
};
8989

‎Model/ESSBeam/simpleItemInc/simpleITEM.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class simpleITEM : public attachSystem::CopiedComp
6565
simpleITEM(const std::string&);
6666
simpleITEM(const simpleITEM&);
6767
simpleITEM& operator=(const simpleITEM&);
68-
~simpleITEM();
68+
~simpleITEM() override;
6969

7070
void build(Simulation&,const GuideItem&,
7171
const Bunker&,const int);

‎Model/ESSBeam/skadiInc/SKADI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class SKADI : public attachSystem::CopiedComp
175175
SKADI(const std::string&);
176176
SKADI(const SKADI&);
177177
SKADI& operator=(const SKADI&);
178-
~SKADI();
178+
~SKADI() override;
179179

180180
void build(Simulation&,const GuideItem&,const Bunker&,const int);
181181

‎Model/ESSBeam/skadiInc/SkadiHut.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class SkadiHut:
6969
int pipeL1Mat;
7070
int pipeL2Mat;
7171

72-
void populate(const FuncDataBase&);
72+
void populate(const FuncDataBase&) override;
7373
void createSurfaces();
7474
void createObjects(Simulation&);
7575
void createLinks();
@@ -79,11 +79,11 @@ class SkadiHut:
7979
SkadiHut(const std::string&);
8080
SkadiHut(const SkadiHut&);
8181
SkadiHut& operator=(const SkadiHut&);
82-
virtual ~SkadiHut();
82+
~SkadiHut() override;
8383

8484
using FixedComp::createAll;
8585
void createAll(Simulation&,const attachSystem::FixedComp&,
86-
const long int);
86+
const long int) override;
8787

8888
};
8989

‎Model/ESSBeam/testBeamInc/TESTBEAM.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class TESTBEAM : public attachSystem::CopiedComp
119119
TESTBEAM(const std::string&);
120120
TESTBEAM(const TESTBEAM&);
121121
TESTBEAM& operator=(const TESTBEAM&);
122-
~TESTBEAM();
122+
~TESTBEAM() override;
123123

124124
void buildIsolated(Simulation&,const int);
125125
void build(Simulation&,const GuideItem&,

‎Model/ESSBeam/trexInc/TREX.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class TREX : public attachSystem::CopiedComp
196196
TREX(const std::string&);
197197
TREX(const TREX&);
198198
TREX& operator=(const TREX&);
199-
~TREX();
199+
~TREX() override;
200200

201201
void build(Simulation&,const GuideItem&,const Bunker&,const int);
202202

‎Model/ESSBeam/trexInc/TrexHut.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class TrexHut:
7272
int L2Mat; ///< Second layer material
7373
int L3Mat; ///< Third layer material
7474

75-
void populate(const FuncDataBase&);
75+
void populate(const FuncDataBase&) override;
7676
void createSurfaces();
7777
void createObjects(Simulation&);
7878
void createLinks();
@@ -82,11 +82,11 @@ class TrexHut:
8282
TrexHut(const std::string&);
8383
TrexHut(const TrexHut&);
8484
TrexHut& operator=(const TrexHut&);
85-
virtual ~TrexHut();
85+
~TrexHut() override;
8686

8787
using FixedComp::createAll;
8888
void createAll(Simulation&,const attachSystem::FixedComp&,
89-
const long int);
89+
const long int) override;
9090

9191
};
9292

‎Model/ESSBeam/vespaInc/VESPA.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ class VESPA : public attachSystem::CopiedComp
256256
VESPA(const std::string&);
257257
VESPA(const VESPA&);
258258
VESPA& operator=(const VESPA&);
259-
~VESPA();
259+
~VESPA() override;
260260

261261
void buildIsolated(Simulation&,const int);
262262
void build(Simulation&,const GuideItem&,

‎Model/ESSBeam/vespaInc/VespaHut.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class VespaHut :
6565
int feMat; ///< Fe layer material
6666
int concMat; ///< Second layer material
6767

68-
void populate(const FuncDataBase&);
69-
void createUnitVector(const attachSystem::FixedComp&,const long int);
68+
void populate(const FuncDataBase&) override;
69+
void createUnitVector(const attachSystem::FixedComp&,const long int) override;
7070
void createSurfaces();
7171
void createObjects(Simulation&);
7272
void createLinks();
@@ -76,11 +76,11 @@ class VespaHut :
7676
VespaHut(const std::string&);
7777
VespaHut(const VespaHut&);
7878
VespaHut& operator=(const VespaHut&);
79-
virtual ~VespaHut();
79+
~VespaHut() override;
8080

8181
using FixedComp::createAll;
8282
void createAll(Simulation&,const attachSystem::FixedComp&,
83-
const long int);
83+
const long int) override;
8484

8585
};
8686

‎Model/ESSBeam/vespaInc/VespaInner.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ class VespaInner :
6969
int feMat; ///< Fe layer material
7070
int concMat; ///< Second layer material
7171

72-
void populate(const FuncDataBase&);
73-
void createUnitVector(const attachSystem::FixedComp&,const long int);
72+
void populate(const FuncDataBase&) override;
73+
void createUnitVector(const attachSystem::FixedComp&,const long int) override;
7474
void createSurfaces();
7575
void createObjects(Simulation&);
7676
void createLinks();
@@ -80,11 +80,11 @@ class VespaInner :
8080
VespaInner(const std::string&);
8181
VespaInner(const VespaInner&);
8282
VespaInner& operator=(const VespaInner&);
83-
virtual ~VespaInner();
83+
~VespaInner() override;
8484

8585
using FixedComp::createAll;
8686
void createAll(Simulation&,const attachSystem::FixedComp&,
87-
const long int);
87+
const long int) override;
8888

8989
};
9090

‎Model/ESSBeam/vorInc/DHut.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class DHut :
5858
int feMat; ///< Fe layer material
5959
int concMat; ///< Second layer material
6060

61-
void populate(const FuncDataBase&);
61+
void populate(const FuncDataBase&) override;
6262
void createSurfaces();
6363
void createObjects(Simulation&);
6464
void createLinks();
@@ -68,11 +68,11 @@ class DHut :
6868
DHut(const std::string&);
6969
DHut(const DHut&);
7070
DHut& operator=(const DHut&);
71-
virtual ~DHut();
71+
~DHut() override;
7272

7373
using FixedComp::createAll;
7474
void createAll(Simulation&,const attachSystem::FixedComp&,
75-
const long int);
75+
const long int) override;
7676

7777
};
7878

0 commit comments

Comments
 (0)