From 304ecf85f455390ff13b87642c3479837ec5ff59 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 12 Oct 2022 12:25:37 +0200 Subject: [PATCH 1/2] Fix for Mac not accepting not override marked overriding methods --- .../Core/SkimmingConfigurableCuts.cxx | 2 +- .../Core/SkimmingConfigurableCuts.h | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx b/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx index c7e9e04f05d..f2d2d5c0e0f 100644 --- a/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx +++ b/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx @@ -594,7 +594,7 @@ CutBrickFnExtToRange::CutBrickFnExtToRange() /// \param lowfn The function which will provide the low value for the cut excluded range /// \param upfn The function which will provide the upper value for the cut excluded range template -CutBrickFnExtToRange::CutBrickFnExtToRange(const char* name, const TF1& lowfn, const TF1& upfn) +CutBrickFnExtToRange::CutBrickFnExtToRange(const char*, const TF1& lowfn, const TF1& upfn) : CutBrickExtToRange(), mLowFunction{lowfn}, mUpFunction{upfn} diff --git a/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h b/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h index 37819214e63..ee15011831e 100644 --- a/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h +++ b/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h @@ -111,9 +111,9 @@ class CutBrickLimit : public CutBrick CutBrickLimit(const CutBrickLimit&) = delete; CutBrickLimit& operator=(const CutBrickLimit&) = delete; - virtual std::vector IsArmed(); - virtual std::vector Filter(const TValueToFilter&); - virtual int Length() { return 1; } + virtual std::vector IsArmed() override; + virtual std::vector Filter(const TValueToFilter&) override; + virtual int Length() override { return 1; } private: void ConstructCutFromString(const TString&); @@ -253,9 +253,9 @@ class CutBrickRange : public CutBrick CutBrickRange(const CutBrickRange&) = delete; CutBrickRange& operator=(const CutBrickRange&) = delete; - virtual std::vector IsArmed(); - virtual std::vector Filter(const TValueToFilter&); - virtual int Length() { return 1; } + virtual std::vector IsArmed() override; + virtual std::vector Filter(const TValueToFilter&) override; + virtual int Length() override { return 1; } private: void ConstructCutFromString(const TString&); @@ -327,9 +327,9 @@ class CutBrickExtToRange : public CutBrick CutBrickExtToRange(const CutBrickExtToRange&) = delete; CutBrickExtToRange& operator=(const CutBrickExtToRange&) = delete; - virtual std::vector IsArmed(); - virtual std::vector Filter(const TValueToFilter&); - virtual int Length() { return 1; } + virtual std::vector IsArmed() override; + virtual std::vector Filter(const TValueToFilter&) override; + virtual int Length() override { return 1; } private: void ConstructCutFromString(const TString&); @@ -437,10 +437,10 @@ class CutWithVariations : public CutBrick bool AddVariationBrick(CutBrick* brick); TList& getDefaultBricks() { return mDefaultBricks; } TList& getVariantBricks() { return mVariationBricks; } - virtual std::vector IsArmed(); - virtual std::vector Filter(const TValueToFilter&); - virtual int Length(); - virtual int getArmedIndex(); + virtual std::vector IsArmed() override; + virtual std::vector Filter(const TValueToFilter&) override; + virtual int Length() override; + virtual int getArmedIndex() override; private: void ConstructCutFromString(const TString&); From e7d54d939e26ab45f8117095993e36e07a152c84 Mon Sep 17 00:00:00 2001 From: Victor Gonzalez Date: Wed, 12 Oct 2022 14:25:03 +0200 Subject: [PATCH 2/2] Update SelectionFilterAndAnalysis.cxx --- .../TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx b/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx index 55a08c758ce..1c816268063 100644 --- a/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx +++ b/PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.cxx @@ -60,7 +60,7 @@ TString SelectionFilterAndAnalysis::printOptionalMasks() const str += ", "; } first = false; - str += TString::Format("0x%016lx", option); + str += TString::Format("0x%016lx", u_long(option)); } str += ")"; return str;