Skip to content

Commit 7d203db

Browse files
committed
More warnings
2 parents 74a9d1a + 9394227 commit 7d203db

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

Alignment/CocoaModel/src/DeviationsFromFileSensor2D.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h"
99
#include "Alignment/CocoaUtilities/interface/ALIFileIn.h"
1010
#include "Alignment/CocoaUtilities/interface/ALIUtils.h"
11+
#include <cassert>
1112
#include <cstdlib>
1213
#include <cmath> // include floating-point std::abs functions
1314
#include <memory>
@@ -188,6 +189,7 @@ std::pair<ALIdouble, ALIdouble> DeviationsFromFileSensor2D::getDevis(ALIdouble i
188189
}
189190
ii++;
190191
}
192+
assert(ii == theNPoints);
191193
if (insideMatrix == 0) {
192194
std::cerr << "!!EXITING intersection in Y outside matrix of deviations from file " << intersY << std::endl;
193195
exit(1);

Alignment/CocoaModel/src/Measurement.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,8 @@ void Measurement::copyMeas(Measurement* meas, const std::string& subsstr1, const
627627
theValueSimulated = new ALIdouble[theDim];
628628
theValueSimulated_orig = new ALIdouble[theDim];
629629
theValueIsSimulated = new ALIbool[theDim];
630-
theValue = const_cast<ALIdouble*>(meas->value());
631-
theSigma = const_cast<ALIdouble*>(meas->sigma());
630+
[[clang::suppress]] theValue = const_cast<ALIdouble*>(meas->value());
631+
[[clang::suppress]] theSigma = const_cast<ALIdouble*>(meas->sigma());
632632

633633
unsigned int ii;
634634
for (ii = 0; ii < theDim; ii++) {

Alignment/OfflineValidation/bin/haddws.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void haddws() {
170170

171171
void MergeRootfile(TDirectory *target, const vector<pair<TFile *, double> > &vFileList) {
172172
//cout << "Target path: " << target->GetPath() << endl;
173-
TString path((char *)strstr(target->GetPath(), ":"));
173+
TString path(strstr(target->GetPath(), ":"));
174174
path.Remove(0, 2);
175175

176176
vec_pair_it it = vFileList.begin();

Alignment/OfflineValidation/macros/loopAndPlot.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void recurseOverKeys(TDirectory *target1, const std::vector<TString> &labels, bo
8888
fullPath.Remove(0, prefixToRemove.Length());
8989
}
9090

91-
TString path((char *)strstr(fullPath.Data(), ":"));
91+
TString path(strstr(fullPath.Data(), ":"));
9292
path.Remove(0, 2);
9393

9494
sourceFiles[0]->cd(path);

0 commit comments

Comments
 (0)