Fix for Mac not accepting not override marked overriding methods (Ali…

…ceO2Group#1351) * Fix for Mac not accepting not override marked overriding methods * Update SelectionFilterAndAnalysis.cxx
mikesas · Oct 12, 2022 · 074bf0b · 074bf0b
1 parent f0c08ab
commit 074bf0b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git 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;

diff --git a/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx b/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx
@@ -594,7 +594,7 @@ CutBrickFnExtToRange<TValueToFilter>::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 <typename TValueToFilter>
-CutBrickFnExtToRange<TValueToFilter>::CutBrickFnExtToRange(const char* name, const TF1& lowfn, const TF1& upfn)
+CutBrickFnExtToRange<TValueToFilter>::CutBrickFnExtToRange(const char*, const TF1& lowfn, const TF1& upfn)
   : CutBrickExtToRange<TValueToFilter>(),
     mLowFunction{lowfn},
     mUpFunction{upfn}

diff --git a/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h b/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
@@ -111,9 +111,9 @@ class CutBrickLimit : public CutBrick<TValueToFilter>
   CutBrickLimit(const CutBrickLimit&) = delete;
   CutBrickLimit& operator=(const CutBrickLimit&) = delete;
 
-  virtual std::vector<bool> IsArmed();
-  virtual std::vector<bool> Filter(const TValueToFilter&);
-  virtual int Length() { return 1; }
+  virtual std::vector<bool> IsArmed() override;
+  virtual std::vector<bool> Filter(const TValueToFilter&) override;
+  virtual int Length() override { return 1; }
 
  private:
   void ConstructCutFromString(const TString&);
@@ -253,9 +253,9 @@ class CutBrickRange : public CutBrick<TValueToFilter>
   CutBrickRange(const CutBrickRange&) = delete;
   CutBrickRange& operator=(const CutBrickRange&) = delete;
 
-  virtual std::vector<bool> IsArmed();
-  virtual std::vector<bool> Filter(const TValueToFilter&);
-  virtual int Length() { return 1; }
+  virtual std::vector<bool> IsArmed() override;
+  virtual std::vector<bool> Filter(const TValueToFilter&) override;
+  virtual int Length() override { return 1; }
 
  private:
   void ConstructCutFromString(const TString&);
@@ -327,9 +327,9 @@ class CutBrickExtToRange : public CutBrick<TValueToFilter>
   CutBrickExtToRange(const CutBrickExtToRange&) = delete;
   CutBrickExtToRange& operator=(const CutBrickExtToRange&) = delete;
 
-  virtual std::vector<bool> IsArmed();
-  virtual std::vector<bool> Filter(const TValueToFilter&);
-  virtual int Length() { return 1; }
+  virtual std::vector<bool> IsArmed() override;
+  virtual std::vector<bool> Filter(const TValueToFilter&) override;
+  virtual int Length() override { return 1; }
 
  private:
   void ConstructCutFromString(const TString&);
@@ -437,10 +437,10 @@ class CutWithVariations : public CutBrick<TValueToFilter>
   bool AddVariationBrick(CutBrick<TValueToFilter>* brick);
   TList& getDefaultBricks() { return mDefaultBricks; }
   TList& getVariantBricks() { return mVariationBricks; }
-  virtual std::vector<bool> IsArmed();
-  virtual std::vector<bool> Filter(const TValueToFilter&);
-  virtual int Length();
-  virtual int getArmedIndex();
+  virtual std::vector<bool> IsArmed() override;
+  virtual std::vector<bool> Filter(const TValueToFilter&) override;
+  virtual int Length() override;
+  virtual int getArmedIndex() override;
 
  private:
   void ConstructCutFromString(const TString&);