Skip to content

Commit 43d2f53

Browse files
linevlinev
committed
[misc] replace double ;; in sources
1 parent 08caeb2 commit 43d2f53

Some content is hidden

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

48 files changed

+86
-86
lines changed

‎bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ static int op_clear(CPPInstance* pyobj)
441441
// Garbage collector clear of held python member objects; this is a good time
442442
// to safely remove this object from the memory regulator.
443443
if (pyobj->fFlags & CPPInstance::kIsRegulated)
444-
MemoryRegulator::UnregisterPyObject(pyobj, (PyObject*)Py_TYPE((PyObject*)pyobj));;
444+
MemoryRegulator::UnregisterPyObject(pyobj, (PyObject*)Py_TYPE((PyObject*)pyobj));
445445

446446
return 0;
447447
}

‎bindings/pyroot/cppyy/CPyCppyy/src/Executors.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ PyObject* CPyCppyy::InstancePtrRefExecutor::Execute(
740740
return BindCppObject(*result, fClass);
741741

742742
CPPInstance* cppinst = (CPPInstance*)fAssignable;
743-
*result = cppinst->GetObject();;
743+
*result = cppinst->GetObject();
744744

745745
Py_DECREF(fAssignable);
746746
fAssignable = nullptr;

‎core/base/src/TStyle.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ void TStyle::BuildStyles()
526526
{
527527
TColor *col = new TColor(); // force the initialisation of fgPalette
528528
new TStyle("Plain", "Plain Style (no colors/fill areas)");
529-
new TStyle("Bold", "Bold Style");;
529+
new TStyle("Bold", "Bold Style");
530530
new TStyle("Video", "Style for video presentation histograms");
531531
new TStyle("Pub", "Style for Publications");
532532
new TStyle("Classic","Classic Style");

‎core/foundation/src/FoundationUtils.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ const std::string& GetEtcDir() {
201201
#endif
202202

203203
const static std::string rootetcdir =
204-
GetRootSys() + GetPathSeparator() + "etc" + GetPathSeparator();;
204+
GetRootSys() + GetPathSeparator() + "etc" + GetPathSeparator();
205205
return rootetcdir;
206206
}
207207

‎core/meta/src/TGenericClassInfo.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ namespace Internal {
448448
// Set the info for the CollectionProxy and take ownership of the object
449449
// being passed
450450

451-
delete fCollectionProxyInfo;;
451+
delete fCollectionProxyInfo;
452452
fCollectionProxyInfo = info;
453453
}
454454

‎core/metacling/src/TCling.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5442,7 +5442,7 @@ const char* TCling::GetTopLevelMacroName() const
54425442
/// std::cout << " TCling::GetTopLevelMacroName() returns " <<
54435443
/// TCling::GetTopLevelMacroName() << std::endl;
54445444
/// std::cout << " Now calling inclfile..." << std::endl;
5445-
/// gInterpreter->ProcessLine(".x inclfile.C");;
5445+
/// gInterpreter->ProcessLine(".x inclfile.C");
54465446
/// }
54475447
/// ~~~
54485448
/// Running mymacro.C will print:

‎graf2d/graf/src/TLatex.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ TLatex::TLatexFormSize TLatex::Analyse(Double_t x, Double_t y, const TextSpec_t
15931593
DrawLine(x+l2+ltip+2*l+fs1.Width(),y2-ltip,x+l2+2*l+2*ltip+fs1.Width(),y2,spec);
15941594
DrawLine(x+l2+ltip+2*l+fs1.Width(),y2+ltip,x+l2+2*l+2*ltip+fs1.Width(),y2,spec);
15951595
}
1596-
result.Set(fs1.Width()+3*l+2*ltip,fs1.Over(),fs1.Under()) ;;
1596+
result.Set(fs1.Width()+3*l+2*ltip,fs1.Over(),fs1.Under());
15971597
}
15981598
else if (opFrac>-1) { // \frac found
15991599
if (opCurlyCurly==-1) { // }{ not found

‎graf2d/graf/src/TLegend.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ The global attributes change the default values for the next created legends.
121121
Text attributes can be also changed individually on each legend entry:
122122
~~~ {.cpp}
123123
TLegendEntry *le = leg->AddEntry(h1,"Histogram filled with random numbers","f");
124-
le->SetTextColor(kBlue);;
124+
le->SetTextColor(kBlue);
125125
~~~
126126
127127
Note that the `TPad` class has a method to build automatically a legend

‎graf2d/postscript/src/TImageDump.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ void TImageDump::DrawFrame(Double_t x1, Double_t y1, Double_t x2, Double_t y2,
247247
frame[0].fX = pxl; frame[0].fY = pyl;
248248
frame[1].fX = pxl + bordersize; frame[1].fY = pyl - bordersize;
249249
frame[2].fX = pxl + bordersize; frame[2].fY = pyt + bordersize;
250-
frame[3].fX = pxt - bordersize; frame[3].fY = pyt + bordersize;;
250+
frame[3].fX = pxt - bordersize; frame[3].fY = pyt + bordersize;
251251
frame[4].fX = pxt; frame[4].fY = pyt;
252252
frame[5].fX = pxl; frame[5].fY = pyt;
253253

‎graf2d/postscript/src/TTeXDump.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ void TTeXDump::DrawPolyMarker(Int_t n, Double_t *xw, Double_t *yw)
525525

526526
void TTeXDump::DrawPS(Int_t nn, Double_t *xw, Double_t *yw)
527527
{
528-
Int_t n = TMath::Abs(nn);;
528+
Int_t n = TMath::Abs(nn);
529529
Float_t x, y;
530530

531531
if( n <= 1) {

‎gui/ged/src/TAxisEditor.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ void TAxisEditor::ConnectSignals2Slots()
250250
(fDiv2->GetNumberEntry())->Connect("ReturnPressed()", "TAxisEditor", this, "DoDivisions()");
251251
fDiv1->Connect("ValueSet(Long_t)", "TAxisEditor", this, "DoDivisions()");
252252
(fDiv1->GetNumberEntry())->Connect("ReturnPressed()", "TAxisEditor", this, "DoDivisions()");
253-
fTitle->Connect("TextChanged(const char *)", "TAxisEditor", this, "DoTitle(const char *)");;
253+
fTitle->Connect("TextChanged(const char *)", "TAxisEditor", this, "DoTitle(const char *)");
254254
fTitleColor->Connect("ColorSelected(Pixel_t)", "TAxisEditor", this, "DoTitleColor(Pixel_t)");
255255
fTitleSize->Connect("ValueSet(Long_t)", "TAxisEditor", this, "DoTitleSize()");
256256
(fTitleSize->GetNumberEntry())->Connect("ReturnPressed()", "TAxisEditor", this, "DoTitleSize()");

‎hist/hist/src/HFitInterface.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ BinData::ErrorType GetDataType(const TGraph * gr, DataOptions & fitOpt) {
528528
int i = 0;
529529
bool zeroError = true;
530530
while (i < gr->GetN() && zeroError) {
531-
if (ey[i] > 0) zeroError = false;;
531+
if (ey[i] > 0) zeroError = false;
532532
++i;
533533
}
534534
if (zeroError) type = BinData::kNoError;

‎hist/hist/src/TFormula_v5.cxx

+14-14
Original file line numberDiff line numberDiff line change
@@ -1473,108 +1473,108 @@ void TFormula::Analyze(const char *schain, Int_t &err, Int_t offset)
14731473
fExpr[fNoper] = "sinh";
14741474
actionCode = ksinh;
14751475
SetAction(fNoper,actionCode,actionParam);
1476-
fNoper++;;
1476+
fNoper++;
14771477
if (!CheckOperands(fNoper-1,err)) return;
14781478
} else if (chaine(0,5) == "tanh(") {
14791479
ctemp = chaine(4,lchain-4);
14801480
Analyze(ctemp.Data(),err,offset); if (err) return;
14811481
fExpr[fNoper] = "tanh";
14821482
actionCode = ktanh;
14831483
SetAction(fNoper,actionCode,actionParam);
1484-
fNoper++;;
1484+
fNoper++;
14851485
if (!CheckOperands(fNoper-1,err)) return;
14861486
} else if (chaine(0,6) == "acosh(") {
14871487
ctemp = chaine(5,lchain-5);
14881488
Analyze(ctemp.Data(),err,offset); if (err) return;
14891489
fExpr[fNoper] = "acosh";
14901490
actionCode = kacosh;
14911491
SetAction(fNoper,actionCode,actionParam);
1492-
fNoper++;;
1492+
fNoper++;
14931493
if (!CheckOperands(fNoper-1,err)) return;
14941494
} else if (chaine(0,6) == "asinh(") {
14951495
ctemp = chaine(5,lchain-5);
14961496
Analyze(ctemp.Data(),err,offset); if (err) return;
14971497
fExpr[fNoper] = "asinh";
14981498
actionCode = kasinh;
14991499
SetAction(fNoper,actionCode,actionParam);
1500-
fNoper++;;
1500+
fNoper++;
15011501
if (!CheckOperands(fNoper-1,err)) return;
15021502
} else if (chaine(0,6) == "atanh(") {
15031503
ctemp = chaine(5,lchain-5);
15041504
Analyze(ctemp.Data(),err,offset); if (err) return;
15051505
fExpr[fNoper] = "atanh";
15061506
actionCode = katanh;
15071507
SetAction(fNoper,actionCode,actionParam);
1508-
fNoper++;;
1508+
fNoper++;
15091509
if (!CheckOperands(fNoper-1,err)) return;
15101510
} else if (chaine(0,3) == "sq(") {
15111511
ctemp = chaine(2,lchain-2);
15121512
Analyze(ctemp.Data(),err,offset); if (err) return;
15131513
fExpr[fNoper] = "sq";
15141514
actionCode = ksq;
15151515
SetAction(fNoper,actionCode,actionParam);
1516-
fNoper++;;
1516+
fNoper++;
15171517
if (!CheckOperands(fNoper-1,err)) return;
15181518
} else if (chaine(0,4) == "log(") {
15191519
ctemp = chaine(3,lchain-3);
15201520
Analyze(ctemp.Data(),err,offset); if (err) return;
15211521
fExpr[fNoper] = "log";
15221522
actionCode = klog;
15231523
SetAction(fNoper,actionCode,actionParam);
1524-
fNoper++;;
1524+
fNoper++;
15251525
if (!CheckOperands(fNoper-1,err)) return;
15261526
} else if (chaine(0,6) == "log10(") {
15271527
ctemp = chaine(5,lchain-5);
15281528
Analyze(ctemp.Data(),err,offset); if (err) return;
15291529
fExpr[fNoper] = "log10";
15301530
actionCode = klog10;
15311531
SetAction(fNoper,actionCode,actionParam);
1532-
fNoper++;;
1532+
fNoper++;
15331533
if (!CheckOperands(fNoper-1,err)) return;
15341534
} else if (chaine(0,4) == "exp(") {
15351535
ctemp = chaine(3,lchain-3);
15361536
Analyze(ctemp.Data(),err,offset); if (err) return;
15371537
fExpr[fNoper] = "exp";
15381538
actionCode = kexp;
15391539
SetAction(fNoper,actionCode,actionParam);
1540-
fNoper++;;
1540+
fNoper++;
15411541
if (!CheckOperands(fNoper-1,err)) return;
15421542
} else if (chaine(0,4) == "abs(") {
15431543
ctemp = chaine(3,lchain-3);
15441544
Analyze(ctemp.Data(),err,offset); if (err) return;
15451545
fExpr[fNoper] = "abs";
15461546
actionCode = kabs;
15471547
SetAction(fNoper,actionCode,actionParam);
1548-
fNoper++;;
1548+
fNoper++;
15491549
if (!CheckOperands(fNoper-1,err)) return;
15501550
} else if (chaine(0,5) == "sign(") {
15511551
ctemp = chaine(4,lchain-4);
15521552
Analyze(ctemp.Data(),err,offset); if (err) return;
15531553
fExpr[fNoper] = "sign";
15541554
actionCode = ksign;
15551555
SetAction(fNoper,actionCode,actionParam);
1556-
fNoper++;;
1556+
fNoper++;
15571557
if (!CheckOperands(fNoper-1,err)) return;
15581558
} else if (chaine(0,4) == "int(") {
15591559
ctemp = chaine(3,lchain-3);
15601560
Analyze(ctemp.Data(),err,offset); if (err) return;
15611561
fExpr[fNoper] = "int";
15621562
actionCode = kint;
15631563
SetAction(fNoper,actionCode,actionParam);
1564-
fNoper++;;
1564+
fNoper++;
15651565
if (!CheckOperands(fNoper-1,err)) return;
15661566
} else if (chaine == "rndm" || chaine(0,5) == "rndm(") {
15671567
fExpr[fNoper] = "rndm";
15681568
actionCode = krndm;
15691569
SetAction(fNoper,actionCode,actionParam);
1570-
fNoper++;;
1570+
fNoper++;
15711571
} else if (chaine(0,5) == "sqrt(") {
15721572
ctemp = chaine(4,lchain-4);
15731573
Analyze(ctemp.Data(),err,offset); if (err) return;
15741574
fExpr[fNoper] = "sqrt";
15751575
actionCode = ksqrt;
15761576
SetAction(fNoper,actionCode,actionParam);
1577-
fNoper++;;
1577+
fNoper++;
15781578
if (!CheckOperands(fNoper-1,err)) return;
15791579

15801580
// Look for an exponential

‎hist/hist/src/TGraphAsymmErrors.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ TGraphAsymmErrors::TGraphAsymmErrors(const TH1 *h)
252252
fEXlow[i] = h->GetBinWidth(i+1)*gStyle->GetErrorX();
253253
fEXhigh[i] = fEXlow[i];
254254
fEYlow[i] = h->GetBinErrorLow(i+1);
255-
fEYhigh[i] = h->GetBinErrorUp(i+1);;
255+
fEYhigh[i] = h->GetBinErrorUp(i+1);
256256
}
257257
}
258258

‎hist/hist/src/TH1.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ Bool_t TH1::Add(const TH1 *h1, Double_t c1)
10031003

10041004
// - Loop on bins (including underflows/overflows)
10051005
Double_t factor = 1;
1006-
if (h1->GetNormFactor() != 0) factor = h1->GetNormFactor()/h1->GetSumOfWeights();;
1006+
if (h1->GetNormFactor() != 0) factor = h1->GetNormFactor()/h1->GetSumOfWeights();
10071007
Double_t c1sq = c1 * c1;
10081008
Double_t factsq = factor * factor;
10091009

‎hist/hist/src/TProfileHelper.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ void TProfileHelper::LabelsDeflate(T* p, Option_t *ax)
589589
// do nothing in case it was the last bin
590590
if (nbins==axis->GetNbins()) return;
591591

592-
T *hold = (T*)p->IsA()->New();;
592+
T *hold = (T*)p->IsA()->New();
593593
hold->SetDirectory(0);
594594
p->Copy(*hold);
595595

@@ -641,7 +641,7 @@ void TProfileHelper::LabelsInflate(T* p, Option_t *ax)
641641
// TAxis *axis = p->GetXaxis();
642642
// if (ax[0] == 'y' || ax[0] == 'Y') axis = p->GetYaxis();
643643

644-
T *hold = (T*)p->IsA()->New();;
644+
T *hold = (T*)p->IsA()->New();
645645
hold->SetDirectory(0);
646646
p->Copy(*hold);
647647

‎io/sql/src/TSQLFile.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2632,7 +2632,7 @@ void TSQLFile::DirWriteHeader(TDirectory *dir)
26322632

26332633
TDirectoryFile *fdir = dynamic_cast<TDirectoryFile *> (dir);
26342634
TString timeC = fdir ? fdir->GetCreationDate().AsSQLString() : fDatimeC.AsSQLString();
2635-
TString timeM = fdir ? fdir->GetModificationDate().AsSQLString() : fDatimeM.AsSQLString();;
2635+
TString timeM = fdir ? fdir->GetModificationDate().AsSQLString() : fDatimeM.AsSQLString();
26362636
if (TestBit(TFile::kReproducible))
26372637
timeC = timeM = TDatime((UInt_t) 1).AsSQLString();
26382638

‎math/mathcore/src/GaussIntegrator.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ double IntegrandTransform::DoEval(double x) const {
237237

238238
double IntegrandTransform::DoEval(double x, double boundary, int sign) const {
239239
double mappedX = 1. / x - 1.;
240-
return (*fIntegrand)(boundary + sign * mappedX) * std::pow(mappedX + 1., 2);;
240+
return (*fIntegrand)(boundary + sign * mappedX) * std::pow(mappedX + 1., 2);
241241
}
242242

243243
double IntegrandTransform::operator()(double x) const {

‎math/mathcore/src/SpecFuncCephes.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ double incbd( double a, double b, double x )
684684
k4 = a + 1.0;
685685
k5 = 1.0;
686686
k6 = a + b;
687-
k7 = a + 1.0;;
687+
k7 = a + 1.0;
688688
k8 = a + 2.0;
689689

690690
pkm2 = 0.0;

‎math/mathmore/test/testDerivation.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ int testDerivation() {
6161
std::cout << "Result: " << result << " +/- " << der->Error() << std::endl;
6262
std::cout << "Exact result: " << f1->Derivative(x0) << std::endl;
6363
std::cout << "EvalForward: " << der->EvalForward(*f1, x0) << std::endl;
64-
std::cout << "EvalBackward: " << der->EvalBackward(x0, step) << std::endl << std::endl;;
64+
std::cout << "EvalBackward: " << der->EvalBackward(x0, step) << std::endl << std::endl;
6565
status += fabs(result-f1->Derivative(x0)) > ERRORLIMIT;
6666

6767

‎math/matrix/src/TDecompSparse.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Int_t TDecompSparse::NonZerosUpperTriang(const TMatrixDSparse &a)
116116
{
117117
const Int_t rowLwb = a.GetRowLwb();
118118
const Int_t colLwb = a.GetColLwb();
119-
const Int_t nrows = a.GetNrows();;
119+
const Int_t nrows = a.GetNrows();
120120
const Int_t *pRowIndex = a.GetRowIndexArray();
121121
const Int_t *pColIndex = a.GetColIndexArray();
122122

@@ -140,7 +140,7 @@ void TDecompSparse::CopyUpperTriang(const TMatrixDSparse &a,Double_t *b)
140140
{
141141
const Int_t rowLwb = a.GetRowLwb();
142142
const Int_t colLwb = a.GetColLwb();
143-
const Int_t nrows = a.GetNrows();;
143+
const Int_t nrows = a.GetNrows();
144144
const Int_t *pRowIndex = a.GetRowIndexArray();
145145
const Int_t *pColIndex = a.GetColIndexArray();
146146
const Double_t *pData = a.GetMatrixArray();

‎math/smatrix/test/matrix_op.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void testVad(const V & v1, const V & v2, double & time, V & result) {
7070
template<class M>
7171
void testMad(const M & m1, const M & m2, double & time, M & result) {
7272
M mtmp = m2;
73-
test::Timer t(time,"M+M ");;
73+
test::Timer t(time,"M+M ");
7474
for (int l = 0; l < NLOOP; l++)
7575
{
7676
mtmp(0,0) = gV[l];
@@ -84,7 +84,7 @@ void testMad(const M & m1, const M & m2, double & time, M & result) {
8484
template<class V>
8585
void testVscale(const V & v1, double a, double & time, V & result) {
8686
V vtmp = v1;
87-
test::Timer t(time,"a*V ");;
87+
test::Timer t(time,"a*V ");
8888
for (int l = 0; l < NLOOP; l++)
8989
{
9090
vtmp[0] = gV[l];
@@ -97,7 +97,7 @@ void testVscale(const V & v1, double a, double & time, V & result) {
9797
template<class M>
9898
void testMscale(const M & m1, double a, double & time, M & result) {
9999
M mtmp = m1;
100-
test::Timer t(time,"a*M ");;
100+
test::Timer t(time,"a*M ");
101101
for (int l = 0; l < NLOOP; l++)
102102
{
103103
mtmp(0,0) = gV[l];
@@ -374,7 +374,7 @@ void testInv_T2(const M & m, double & time, M& result){
374374
template<class V>
375375
void testVad_T(const V & v1, const V & v2, double & time, V & result) {
376376
V vtmp = v2;
377-
test::Timer t(time,"V+V ");;
377+
test::Timer t(time,"V+V ");
378378
for (int l = 0; l < 10*NLOOP; l++)
379379
{
380380
vtmp[0] = gV[l];
@@ -386,7 +386,7 @@ void testVad_T(const V & v1, const V & v2, double & time, V & result) {
386386
template<class V>
387387
void testVscale_T(const V & v1, double a, double & time, V & result) {
388388
V vtmp = v1;
389-
test::Timer t(time,"a*V ");;
389+
test::Timer t(time,"a*V ");
390390
for (int l = 0; l < NLOOP; l++)
391391
{
392392
// result = a * v1;
@@ -413,7 +413,7 @@ void testATBA_T2(const A & a, const B & b, double & time, C & result) {
413413
template<class M>
414414
void testMscale_T(const M & m1, double a, double & time, M & result) {
415415
M mtmp = m1;
416-
test::Timer t(time,"a*M ");;
416+
test::Timer t(time,"a*M ");
417417
for (int l = 0; l < NLOOP; l++)
418418
{
419419
//result = a * m1;
@@ -483,7 +483,7 @@ void testMeq_C(const M & m, double & time, M & result) {
483483
template<class M>
484484
void testMad_C(const M & m1, const M & m2, double & time, M & result) {
485485
M mtmp = m2;
486-
test::Timer t(time,"M+M ");;
486+
test::Timer t(time,"M+M ");
487487
for (int l = 0; l < NLOOP; l++)
488488
{
489489
mtmp(1,1) = gV[l];
@@ -496,7 +496,7 @@ void testMad_C(const M & m1, const M & m2, double & time, M & result) {
496496
template<class M>
497497
void testMscale_C(const M & m1, double a, double & time, M & result) {
498498
M mtmp = m1;
499-
test::Timer t(time,"a*M ");;
499+
test::Timer t(time,"a*M ");
500500
for (int l = 0; l < NLOOP; l++)
501501
{
502502
mtmp(1,1) = gV[l];

0 commit comments

Comments
 (0)