[r] Avoid suggest-override warnings in R bindings

guitargeek · guitargeek · commit 3e860a5aef84 · 2025-11-06T18:14:13.000+01:00
diff --git a/bindings/r/inc/RExports.h b/bindings/r/inc/RExports.h
@@ -46,6 +46,7 @@
 #pragma GCC diagnostic ignored "-Woverloaded-virtual"
 #pragma GCC diagnostic ignored "-Wextra"
 #pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#pragma GCC diagnostic ignored "-Wsuggest-override"
 // disable warning for macos
 #if defined(__APPLE__)
 #pragma GCC diagnostic ignored "-Wnonportable-include-path"
diff --git a/bindings/r/inc/TRDataFrame.h b/bindings/r/inc/TRDataFrame.h
@@ -434,7 +434,7 @@ namespace ROOT {
                print(df[label]);
             }
          }
-         ClassDef(TRDataFrame, 0) //
+         ClassDefOverride(TRDataFrame, 0) //
       };
    }
 }
diff --git a/bindings/r/inc/TRFunctionExport.h b/bindings/r/inc/TRFunctionExport.h
@@ -180,7 +180,7 @@ namespace ROOT {
             f = new TRInternalFunction(fun);
          }
 
-         ClassDef(TRFunctionExport, 0) //
+         ClassDefOverride(TRFunctionExport, 0) //
       };
    }
 }
diff --git a/bindings/r/inc/TRFunctionImport.h b/bindings/r/inc/TRFunctionImport.h
@@ -165,7 +165,7 @@ namespace ROOT {
             return (*f)();
          }
 #include<TRFunctionImport__oprtr.h>
-         ClassDef(TRFunctionImport, 0) //
+         ClassDefOverride(TRFunctionImport, 0) //
       };
 
       template<> inline TRObject::operator TRFunctionImport()
diff --git a/bindings/r/inc/TRInterface.h b/bindings/r/inc/TRInterface.h
@@ -317,7 +317,7 @@ namespace ROOT {
          */
          static TRInterface *InstancePtr();
 
-         ClassDef(TRInterface, 0)
+         ClassDefOverride(TRInterface, 0)
       };
    }
 }
diff --git a/bindings/r/inc/TRObject.h b/bindings/r/inc/TRObject.h
@@ -191,7 +191,7 @@ namespace ROOT {
                return T();
             }
          }
-         ClassDef(TRObject, 0) //
+         ClassDefOverride(TRObject, 0) //
       };
 
    }
diff --git a/tmva/rmva/inc/TMVA/MethodC50.h b/tmva/rmva/inc/TMVA/MethodC50.h
@@ -45,34 +45,34 @@ namespace TMVA {
 
 
       ~MethodC50(void);
-      void     Train();
+      void Train() override;
       // options treatment
-      void     Init();
-      void     DeclareOptions();
-      void     ProcessOptions();
+      void Init() override;
+      void DeclareOptions() override;
+      void ProcessOptions() override;
       // create ranking
-      const Ranking *CreateRanking()
+      const Ranking *CreateRanking() override
       {
          return nullptr;  // = 0;
       }
 
 
-      Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets);
+      Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets) override;
 
       // performs classifier testing
-      virtual void     TestClassification();
+      void TestClassification() override;
 
 
-      Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr);
-      virtual void     MakeClass(const TString &classFileName = TString("")) const;  //required for model persistence
+      Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr) override;
+      void     MakeClass(const TString &classFileName = TString("")) const override;  //required for model persistence
       using MethodBase::ReadWeightsFromStream;
       // the actual "weights"
-      virtual void AddWeightsXMLTo(void * /*parent*/) const {} // = 0;
-      virtual void ReadWeightsFromXML(void * /*weight*/) {} // = 0;
-      virtual void ReadWeightsFromStream(std::istream &) {} //= 0;       // backward compatibility
+      void AddWeightsXMLTo(void * /*parent*/) const override {} // = 0;
+      void ReadWeightsFromXML(void * /*weight*/) override {} // = 0;
+      void ReadWeightsFromStream(std::istream &) override {} //= 0;       // backward compatibility
 
       // signal/background classification response for all current set of data
-      virtual std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false);
+      std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false) override;
 
       void ReadModelFromFile();
    private :
@@ -109,9 +109,9 @@ namespace TMVA {
 
 
       // get help message text
-      void GetHelpMessage() const;
+      void GetHelpMessage() const override;
 
-      ClassDef(MethodC50, 0)
+      ClassDefOverride(MethodC50, 0)
    };
 } // namespace TMVA
 #endif
diff --git a/tmva/rmva/inc/TMVA/MethodRSNNS.h b/tmva/rmva/inc/TMVA/MethodRSNNS.h
@@ -45,36 +45,36 @@ namespace TMVA {
 
 
       ~MethodRSNNS(void);
-      void     Train();
+      void Train() override;
       // options treatment
-      void     Init();
-      void     DeclareOptions();
-      void     ProcessOptions();
+      void Init() override;
+      void DeclareOptions() override;
+      void ProcessOptions() override;
       // create ranking
-      const Ranking *CreateRanking()
+      const Ranking *CreateRanking() override
       {
          return nullptr;  // = 0;
       }
 
 
-      Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets);
+      Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets) override;
 
       // performs classifier testing
-      virtual void     TestClassification();
+      void TestClassification() override;
 
 
-      Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr);
+      Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr) override;
 
       using MethodBase::ReadWeightsFromStream;
       // the actual "weights"
-      virtual void AddWeightsXMLTo(void * /*parent*/) const {}  // = 0;
-      virtual void ReadWeightsFromXML(void * /*wghtnode*/) {} // = 0;
-      virtual void ReadWeightsFromStream(std::istream &) {} //= 0;       // backward compatibility
+      void AddWeightsXMLTo(void * /*parent*/) const override {}  // = 0;
+      void ReadWeightsFromXML(void * /*wghtnode*/) override {} // = 0;
+      void ReadWeightsFromStream(std::istream &) override {} //= 0;       // backward compatibility
 
       void ReadModelFromFile();
 
       // signal/background classification response for all current set of data
-      virtual std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false);
+      virtual std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false) override;
 
    private :
       DataSetManager    *fDataSetManager;     // DSMTEST
@@ -115,9 +115,9 @@ namespace TMVA {
       ROOT::R::TRFunctionImport asfactor;
       ROOT::R::TRObject         *fModel;
       // get help message text
-      void GetHelpMessage() const;
+      void GetHelpMessage() const override;
 
-      ClassDef(MethodRSNNS, 0)
+      ClassDefOverride(MethodRSNNS, 0)
    };
 } // namespace TMVA
 #endif
diff --git a/tmva/rmva/inc/TMVA/MethodRSVM.h b/tmva/rmva/inc/TMVA/MethodRSVM.h
@@ -45,35 +45,35 @@ namespace TMVA {
 
 
       ~MethodRSVM(void);
-      void     Train();
+      void Train() override;
       // options treatment
-      void     Init();
-      void     DeclareOptions();
-      void     ProcessOptions();
+      void Init() override;
+      void DeclareOptions() override;
+      void ProcessOptions() override;
       // create ranking
-      const Ranking *CreateRanking()
+      const Ranking *CreateRanking() override
       {
          return nullptr;  // = 0;
       }
 
 
-      Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets);
+      Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets) override;
 
       // performs classifier testing
-      virtual void     TestClassification();
+      void TestClassification() override;
 
 
-      Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr);
+      Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr) override;
 
       using MethodBase::ReadWeightsFromStream;
       // the actual "weights"
-      virtual void AddWeightsXMLTo(void * /*parent*/) const {}  // = 0;
-      virtual void ReadWeightsFromXML(void * /*wghtnode*/) {} // = 0;
-      virtual void ReadWeightsFromStream(std::istream &) {} //= 0;       // backward compatibility
+      void AddWeightsXMLTo(void * /*parent*/) const override {}  // = 0;
+      void ReadWeightsFromXML(void * /*wghtnode*/) override {} // = 0;
+      void ReadWeightsFromStream(std::istream &) override {} //= 0;       // backward compatibility
       void ReadModelFromFile();
 
       // signal/background classification response for all current set of data
-      virtual std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false);
+      std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false) override;
 
    private :
       DataSetManager    *fDataSetManager;     // DSMTEST
@@ -130,9 +130,9 @@ namespace TMVA {
       ROOT::R::TRFunctionImport asfactor;
       ROOT::R::TRObject *fModel;
       // get help message text
-      void GetHelpMessage() const;
+      void GetHelpMessage() const override;
 
-      ClassDef(MethodRSVM, 0)
+      ClassDefOverride(MethodRSVM, 0)
    };
 } // namespace TMVA
 #endif
diff --git a/tmva/rmva/inc/TMVA/MethodRXGB.h b/tmva/rmva/inc/TMVA/MethodRXGB.h
@@ -45,36 +45,36 @@ namespace TMVA {
 
 
       ~MethodRXGB(void);
-      void     Train();
+      void Train() override;
       // options treatment
-      void     Init();
-      void     DeclareOptions();
-      void     ProcessOptions();
+      void Init() override;
+      void DeclareOptions() override;
+      void ProcessOptions() override;
       // create ranking
-      const Ranking *CreateRanking()
+      const Ranking *CreateRanking() override
       {
          return nullptr;  // = 0;
       }
 
 
-      Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets);
+      Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets) override;
 
       // performs classifier testing
-      virtual void     TestClassification();
+      void TestClassification() override;
 
 
-      Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr);
-      virtual void     MakeClass(const TString &classFileName = TString("")) const;  //required for model persistence
+      Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr) override;
+      void MakeClass(const TString &classFileName = TString("")) const override;  //required for model persistence
       using MethodBase::ReadWeightsFromStream;
       // the actual "weights"
-      virtual void AddWeightsXMLTo(void * /*parent*/) const {}  // = 0;
-      virtual void ReadWeightsFromXML(void * /*wghtnode*/) {} // = 0;
-      virtual void ReadWeightsFromStream(std::istream &) {} //= 0;       // backward compatibility
+      void AddWeightsXMLTo(void * /*parent*/) const override {}  // = 0;
+      void ReadWeightsFromXML(void * /*wghtnode*/) override {} // = 0;
+      void ReadWeightsFromStream(std::istream &) override {} //= 0;       // backward compatibility
 
       void ReadModelFromFile();
 
       // signal/background classification response for all current set of data
-      virtual std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false);
+      std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false) override;
 
    private :
       DataSetManager    *fDataSetManager;     // DSMTEST
@@ -104,9 +104,9 @@ namespace TMVA {
 
 
       // get help message text
-      void GetHelpMessage() const;
+      void GetHelpMessage() const override;
 
-      ClassDef(MethodRXGB, 0)
+      ClassDefOverride(MethodRXGB, 0)
    };
 } // namespace TMVA
 #endif
diff --git a/tmva/rmva/inc/TMVA/RMethodBase.h b/tmva/rmva/inc/TMVA/RMethodBase.h
@@ -64,27 +64,7 @@ namespace TMVA {
       RMethodBase(Types::EMVA methodType,
                   DataSetInfo &dsi,
                   const TString &weightFile, ROOT::R::TRInterface &_r = ROOT::R::TRInterface::Instance());
-
-      // default destructur
-      virtual ~RMethodBase() {};
-      virtual void     Train() = 0;
-      // options treatment
-      virtual void     Init()           = 0;
-      virtual void     DeclareOptions() = 0;
-      virtual void     ProcessOptions() = 0;
-      // create ranking
-      virtual const Ranking *CreateRanking() = 0;
-
-      virtual Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr) = 0;
-
-      Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets) = 0;
    protected:
-      // the actual "weights"
-      virtual void AddWeightsXMLTo(void *parent) const = 0;
-      virtual void ReadWeightsFromXML(void *wghtnode) = 0;
-      virtual void ReadWeightsFromStream(std::istream &) = 0;        // backward compatibility
-      virtual void ReadWeightsFromStream(TFile &) {}                 // backward compatibility
-
 
       void LoadData();//Read data from Data() Aand DataInfo() to Dataframes and Vectors
    protected:
@@ -97,7 +77,7 @@ namespace TMVA {
       ROOT::R::TRDataFrame fDfSpectators;
 
    private:
-      ClassDef(RMethodBase, 0) // Virtual base class for all TMVA method
+      ClassDefOverride(RMethodBase, 0) // Virtual base class for all TMVA method
 
    };
 } // namespace TMVA

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ namespace ROOT {`
`434`	`434`	`print(df[label]);`
`435`	`435`	`}`
`436`	`436`	`}`
`437`		`- ClassDef(TRDataFrame, 0) //`
	`437`	`+ ClassDefOverride(TRDataFrame, 0) //`
`438`	`438`	`};`
`439`	`439`	`}`
`440`	`440`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ namespace ROOT {`
`180`	`180`	`f = new TRInternalFunction(fun);`
`181`	`181`	`}`
`182`	`182`
`183`		`- ClassDef(TRFunctionExport, 0) //`
	`183`	`+ ClassDefOverride(TRFunctionExport, 0) //`
`184`	`184`	`};`
`185`	`185`	`}`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ namespace ROOT {`
`165`	`165`	`return (*f)();`
`166`	`166`	`}`
`167`	`167`	`#include<TRFunctionImport__oprtr.h>`
`168`		`- ClassDef(TRFunctionImport, 0) //`
	`168`	`+ ClassDefOverride(TRFunctionImport, 0) //`
`169`	`169`	`};`
`170`	`170`
`171`	`171`	`template<> inline TRObject::operator TRFunctionImport()`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ namespace ROOT {`
`317`	`317`	`*/`
`318`	`318`	`static TRInterface *InstancePtr();`
`319`	`319`
`320`		`- ClassDef(TRInterface, 0)`
	`320`	`+ ClassDefOverride(TRInterface, 0)`
`321`	`321`	`};`
`322`	`322`	`}`
`323`	`323`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ namespace ROOT {`
`191`	`191`	`return T();`
`192`	`192`	`}`
`193`	`193`	`}`
`194`		`- ClassDef(TRObject, 0) //`
	`194`	`+ ClassDefOverride(TRObject, 0) //`
`195`	`195`	`};`
`196`	`196`
`197`	`197`	`}`