Skip to content

Commit 074bf0b

Browse files
Fix for Mac not accepting not override marked overriding methods (#1351)
* Fix for Mac not accepting not override marked overriding methods * Update SelectionFilterAndAnalysis.cxx
1 parent f0c08ab commit 074bf0b

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ TString SelectionFilterAndAnalysis::printOptionalMasks() const
6060
str += ", ";
6161
}
6262
first = false;
63-
str += TString::Format("0x%016lx", option);
63+
str += TString::Format("0x%016lx", u_long(option));
6464
}
6565
str += ")";
6666
return str;

PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ CutBrickFnExtToRange<TValueToFilter>::CutBrickFnExtToRange()
594594
/// \param lowfn The function which will provide the low value for the cut excluded range
595595
/// \param upfn The function which will provide the upper value for the cut excluded range
596596
template <typename TValueToFilter>
597-
CutBrickFnExtToRange<TValueToFilter>::CutBrickFnExtToRange(const char* name, const TF1& lowfn, const TF1& upfn)
597+
CutBrickFnExtToRange<TValueToFilter>::CutBrickFnExtToRange(const char*, const TF1& lowfn, const TF1& upfn)
598598
: CutBrickExtToRange<TValueToFilter>(),
599599
mLowFunction{lowfn},
600600
mUpFunction{upfn}

PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ class CutBrickLimit : public CutBrick<TValueToFilter>
111111
CutBrickLimit(const CutBrickLimit&) = delete;
112112
CutBrickLimit& operator=(const CutBrickLimit&) = delete;
113113

114-
virtual std::vector<bool> IsArmed();
115-
virtual std::vector<bool> Filter(const TValueToFilter&);
116-
virtual int Length() { return 1; }
114+
virtual std::vector<bool> IsArmed() override;
115+
virtual std::vector<bool> Filter(const TValueToFilter&) override;
116+
virtual int Length() override { return 1; }
117117

118118
private:
119119
void ConstructCutFromString(const TString&);
@@ -253,9 +253,9 @@ class CutBrickRange : public CutBrick<TValueToFilter>
253253
CutBrickRange(const CutBrickRange&) = delete;
254254
CutBrickRange& operator=(const CutBrickRange&) = delete;
255255

256-
virtual std::vector<bool> IsArmed();
257-
virtual std::vector<bool> Filter(const TValueToFilter&);
258-
virtual int Length() { return 1; }
256+
virtual std::vector<bool> IsArmed() override;
257+
virtual std::vector<bool> Filter(const TValueToFilter&) override;
258+
virtual int Length() override { return 1; }
259259

260260
private:
261261
void ConstructCutFromString(const TString&);
@@ -327,9 +327,9 @@ class CutBrickExtToRange : public CutBrick<TValueToFilter>
327327
CutBrickExtToRange(const CutBrickExtToRange&) = delete;
328328
CutBrickExtToRange& operator=(const CutBrickExtToRange&) = delete;
329329

330-
virtual std::vector<bool> IsArmed();
331-
virtual std::vector<bool> Filter(const TValueToFilter&);
332-
virtual int Length() { return 1; }
330+
virtual std::vector<bool> IsArmed() override;
331+
virtual std::vector<bool> Filter(const TValueToFilter&) override;
332+
virtual int Length() override { return 1; }
333333

334334
private:
335335
void ConstructCutFromString(const TString&);
@@ -437,10 +437,10 @@ class CutWithVariations : public CutBrick<TValueToFilter>
437437
bool AddVariationBrick(CutBrick<TValueToFilter>* brick);
438438
TList& getDefaultBricks() { return mDefaultBricks; }
439439
TList& getVariantBricks() { return mVariationBricks; }
440-
virtual std::vector<bool> IsArmed();
441-
virtual std::vector<bool> Filter(const TValueToFilter&);
442-
virtual int Length();
443-
virtual int getArmedIndex();
440+
virtual std::vector<bool> IsArmed() override;
441+
virtual std::vector<bool> Filter(const TValueToFilter&) override;
442+
virtual int Length() override;
443+
virtual int getArmedIndex() override;
444444

445445
private:
446446
void ConstructCutFromString(const TString&);

0 commit comments

Comments
 (0)