[rootest] use override syntax for classes in io/newstl

linev · linev · commit 81559f52969b · 2025-08-22T13:30:50.000+02:00
diff --git a/roottest/root/io/newstl/ComplexTest.h b/roottest/root/io/newstl/ComplexTest.h
@@ -1,25 +1,25 @@
+#ifndef Test_hh
+#define Test_hh
+
 #include "TObject.h"
 #include <complex>
 #include <vector>
 
-#ifndef Test_hh
-#define Test_hh
-
 class Test: public TObject
 {
   public:
-    
+
    std::complex<double> fMyComplexVector;
    //std::vector<std::complex<double> > fMyComplexVector;
 
    void Set(int seed) {
       fMyComplexVector = std::complex<double>(seed,seed*2);
    }
-   
+
    bool TestValue(int seed) {
       return ( seed == (int)fMyComplexVector.real() && seed == (int)(fMyComplexVector.imag()/2) );
    }
-   
-  ClassDef(Test, 1);
+
+  ClassDefOverride(Test, 1);
 };
 #endif /* Test_hh */
diff --git a/roottest/root/io/newstl/TestHelpers.h b/roottest/root/io/newstl/TestHelpers.h
@@ -15,8 +15,8 @@ bool IsEquiv(float orig, float copy) {
 bool IsEquiv(double orig, double copy) {
    double epsilon = 1e-14;
    double diff = orig-copy;
-// std::cerr << "epsilon = " << epsilon 
-//              << " diff = " << diff 
+// std::cerr << "epsilon = " << epsilon
+//              << " diff = " << diff
 //              << " div  = " << diff/copy
 //              << " abs = " << TMath::Abs( diff/copy )
 //              << " bool = " << (TMath::Abs( diff/copy ) < epsilon) << std::endl;
@@ -39,7 +39,7 @@ class nonvirtHelper {
 class Helper {
 public:
    unsigned int val;
-   double dval;   
+   double dval;
    Helper() : val(0),dval(0) {}
    explicit Helper(int v,double d) : val(v),dval(d) {}
    virtual ~Helper() {};
@@ -71,8 +71,8 @@ class HelperDerived : public HelperClassDef {
    float f;
    HelperDerived() : f(-1) {};
    explicit HelperDerived(int v,double d, float finput) : HelperClassDef(v,d),f(finput) {};
- 
-   virtual bool IsEquiv(const Helper &rhs) const { 
+
+   virtual bool IsEquiv(const Helper &rhs) const {
       bool result = Helper::IsEquiv(rhs);
       if (result) {
          const HelperDerived *drhs = dynamic_cast<const HelperDerived*>(&rhs);
@@ -92,7 +92,7 @@ class HelperDerived : public HelperClassDef {
       return Form("HelperDerived object wrote %d %g %f and read %d %g %f\n",val,dval,f,drhs->val,drhs->dval,drhs->f);
    }
 
-   ClassDef(HelperDerived,1);
+   ClassDefOverride(HelperDerived,1);
 };
 
 class THelper : public Helper, public TObject {
@@ -104,16 +104,16 @@ class THelper : public Helper, public TObject {
       if (copy==0) return "Wrong type (expected THelper)\n";
       return Form("THelper object wrote %d %g and read %d %g\n",val,dval,copy->val,copy->dval);
    }
-   ClassDef(THelper,1);
+   ClassDefOverride(THelper,1);
 };
 
 class THelperDerived : public THelper {
  public:
    float f;
    THelperDerived() : f(-1) {};
    explicit THelperDerived(int v,double d, float finput) : THelper(v,d),f(finput) {};
- 
-   virtual bool IsEquiv(const Helper &rhs) const { 
+
+   virtual bool IsEquiv(const Helper &rhs) const {
       bool result = Helper::IsEquiv(rhs);
       if (result) {
          const THelperDerived *drhs = dynamic_cast<const THelperDerived*>(&rhs);
@@ -133,7 +133,7 @@ class THelperDerived : public THelper {
       return Form("THelperDerived object wrote %d %g %f and read %d %g %f\n",val,dval,f,drhs->val,drhs->dval,drhs->f);
    }
 
-   ClassDef(THelperDerived,1);
+   ClassDefOverride(THelperDerived,1);
 };
 
 template <class T> class GHelper {
diff --git a/roottest/root/io/newstl/contHolder.h b/roottest/root/io/newstl/contHolder.h
@@ -17,7 +17,7 @@
 #include "TestSetOrVerify.h"
 
 class TEST_CONT_HOLDER : public TObject {
-public:   
+public:
 
    TEST_CONT_HOLDER() : TObject()
       ,fScalarArrVar(0)
@@ -45,7 +45,7 @@ class TEST_CONT_HOLDER : public TObject {
          for(int index=0;index<4;index++) fScalarPtrArr[index]=0;
          Reset(entry);
       }
-   
+
    TEST_CONT<EHelper > fEnum;
 
 
@@ -58,9 +58,9 @@ class TEST_CONT_HOLDER : public TObject {
    TEST_CONT<std::pair<float,int> >         fPairFlInt;
    TEST_CONT<std::pair<std::string,double> > fPairStrDb;
 
-   TEST_CONT<GHelper<GHelper<GHelper<float> > > > fTemplates; 
+   TEST_CONT<GHelper<GHelper<GHelper<float> > > > fTemplates;
 #endif
-   
+
    UInt_t                   fScalarArrVarSize;
    TEST_CONT<char >   *fScalarArrVar; //[fScalarArrVarSize]
 
@@ -73,7 +73,7 @@ class TEST_CONT_HOLDER : public TObject {
    TEST_CONT<double > *fScalarPtrArr[4];
    UInt_t                   fScalarPtrArrVarSize;
    TEST_CONT<int >    *fScalarPtrArrVar; //[fScalarPtrArrVarSize]
-   
+
 
 #if defined(R__CANNOT_SPLIT_STL_CONTAINER)
    TEST_CONT<Helper >   fObject;  //||
@@ -126,7 +126,7 @@ class TEST_CONT_HOLDER : public TObject {
    TEST_CONT<HelperClassDef*>  fPtrHelperDerived;  //!
 #else
    TEST_CONT<THelper*>         fPtrTHelperDerived;
-   TEST_CONT<HelperClassDef*>  fPtrHelperDerived; 
+   TEST_CONT<HelperClassDef*>  fPtrHelperDerived;
 #endif
 
 #if defined(R__NO_NESTED_CONTAINER)
@@ -148,40 +148,40 @@ class TEST_CONT_HOLDER : public TObject {
       return utility::SetOrVerify("fEnum",fEnum,seed,entryNumber,reset,testname);
    }
    VERIFY(Enum);
-   
+
 
    bool SetOrVerifyTemplates(Int_t entryNumber, bool reset, const std::string &testname,int /*splitlevel*/) {
       Int_t seed = 1 * (entryNumber+1);
       return utility::SetOrVerify("fTemplates",fTemplates,seed,entryNumber,reset,testname);
    }
    VERIFY(Templates);
-   
+
 
    bool SetOrVerifyPairFlInt(Int_t entryNumber, bool reset, const std::string &testname,int /*splitlevel*/) {
       Int_t seed = 1 * (entryNumber+1);
       return utility::SetOrVerify("fPairFlInt",fPairFlInt,seed,entryNumber,reset,testname);
    }
    VERIFY(PairFlInt);
-   
+
    bool SetOrVerifyPairStrDb(Int_t entryNumber, bool reset, const std::string &testname,int /*splitlevel*/) {
       Int_t seed = 1 * (entryNumber+1);
       return utility::SetOrVerify("fPairStrDb",fPairStrDb,seed,entryNumber,reset,testname);
    }
    VERIFY(PairStrDb);
-   
+
 
    bool SetOrVerifyBool(Int_t entryNumber, bool reset, const std::string &testname,int /*splitlevel*/) {
       Int_t seed = 1 * (entryNumber+1);
       return utility::SetOrVerify("fBool",fBool,seed,entryNumber,reset,testname);
    }
    VERIFY(Bool);
-   
+
    bool SetOrVerifyScalar(Int_t entryNumber, bool reset, const std::string &testname,int /*splitlevel*/) {
       Int_t seed = 1 * (entryNumber+1);
       return utility::SetOrVerify("fScalar",fScalar,seed,entryNumber,reset,testname);
    }
    VERIFY(Scalar);
-   
+
    bool SetOrVerifyScalarArr(Int_t entryNumber, bool reset, const std::string &testname, int /*splitlevel*/) {
       Int_t seed = 2 * (entryNumber+1);
       return utility::SetOrVerify("fScalarArr",&(fScalarArr[0]), 2 ,seed,entryNumber,reset,testname);
@@ -191,7 +191,7 @@ class TEST_CONT_HOLDER : public TObject {
    bool SetOrVerifyScalarArrVar(Int_t entryNumber, bool reset, const std::string &testname, int /*splitlevel*/) {
       if (!reset && gFile && !HasVarArrayOfContainers(gFile)) {
          return true;
-      }      
+      }
       Int_t seed = 3 * (entryNumber+1);
       return utility::SetOrVerifyArrVar("fScalarArrVar",fScalarArrVar,fScalarArrVarSize,seed,entryNumber,reset,testname);
    }
@@ -213,7 +213,7 @@ class TEST_CONT_HOLDER : public TObject {
    bool SetOrVerifyScalarPtrArrVar(Int_t entryNumber, bool reset, const std::string &testname, int /*splitlevel*/) {
       if (!reset && gFile && !HasVarArrayOfContainers(gFile)) {
          return true;
-      }      
+      }
       Int_t seed = 6 * (entryNumber+1);
       return utility::SetOrVerifyArrVar("fScalarPtrArrVar",fScalarPtrArrVar,fScalarPtrArrVarSize,seed,entryNumber,reset,testname);
    }
@@ -482,22 +482,22 @@ class TEST_CONT_HOLDER : public TObject {
    }
 
 public:
-   
+
    void Reset(Int_t entryNumber) {
       SetOrVerify(entryNumber, true, "reseting", 0);
    }
-   
+
    bool Verify(Int_t entryNumber, const std::string &testname, int splitlevel) {
       return SetOrVerify(entryNumber,false,testname,splitlevel);
    }
 
 #if defined(R__NO_NESTED_CONTAINER)
-   ClassDef(TEST_CONT_HOLDER,1);
-#else 
+   ClassDefOverride(TEST_CONT_HOLDER,1);
+#else
 #if defined(R__NO_POLYMORPH_CLASSDEF_NONTOBJECT)
-   ClassDef(TEST_CONT_HOLDER,2);
+   ClassDefOverride(TEST_CONT_HOLDER,2);
 #else
-   ClassDef(TEST_CONT_HOLDER,3);
+   ClassDefOverride(TEST_CONT_HOLDER,3);
 #endif
 #endif
 };
diff --git a/roottest/root/io/newstl/gmapHolder.h b/roottest/root/io/newstl/gmapHolder.h
@@ -17,7 +17,7 @@
 
 class TEST_MAP_HOLDER : public TObject {
 
-public:   
+public:
 
    TEST_MAP_HOLDER() : TObject()
       ,fScalarArrVar(0)
@@ -45,12 +45,12 @@ class TEST_MAP_HOLDER : public TObject {
          for(int index=0;index<4;index++) fScalarPtrArr[index]=0;
          Reset(entry);
       }
-   
+
    std::TEST_MAP<EHelper, int > fEnumInt;
    std::TEST_MAP<std::string, EHelper > fStrEnum;
 
    std::TEST_MAP<float, bool >    fScalar;
-  
+
    std::TEST_MAP<short, char >    fScalarArr[2];
    UInt_t                         fScalarArrVarSize;
    std::TEST_MAP<char, short >   *fScalarArrVar; //[fScalarArrVarSize]
@@ -59,7 +59,7 @@ class TEST_MAP_HOLDER : public TObject {
    std::TEST_MAP<double, float > *fScalarPtrArr[4];
    UInt_t                         fScalarPtrArrVarSize;
    std::TEST_MAP<int,double >    *fScalarPtrArrVar; //[fScalarPtrArrVarSize]
-   
+
 
    std::TEST_MAP<Helper, Helper >  fObject;
    std::TEST_MAP<Helper, Helper*> *fObjectPtr;
@@ -121,19 +121,19 @@ class TEST_MAP_HOLDER : public TObject {
       return utility::SetOrVerify("fEnumInt",fEnumInt,seed,entryNumber,reset,testname);
    }
    VERIFY(EnumInt);
-   
+
    bool SetOrVerifyStrEnum(Int_t entryNumber, bool reset, const std::string &testname,int /*splitlevel*/) {
       Int_t seed = 1 * (entryNumber+1);
       return utility::SetOrVerify("fStrEnum",fStrEnum,seed,entryNumber,reset,testname);
    }
    VERIFY(StrEnum);
-   
+
    bool SetOrVerifyScalar(Int_t entryNumber, bool reset, const std::string &testname,int /*splitlevel*/) {
       Int_t seed = 1 * (entryNumber+1);
       return utility::SetOrVerify("fScalar",fScalar,seed,entryNumber,reset,testname);
    }
    VERIFY(Scalar);
-   
+
    bool SetOrVerifyScalarArr(Int_t entryNumber, bool reset, const std::string &testname, int /*splitlevel*/) {
       Int_t seed = 2 * (entryNumber+1);
       return utility::SetOrVerify("fScalarArr",&(fScalarArr[0]), 2 ,seed,entryNumber,reset,testname);
@@ -143,7 +143,7 @@ class TEST_MAP_HOLDER : public TObject {
    bool SetOrVerifyScalarArrVar(Int_t entryNumber, bool reset, const std::string &testname, int /*splitlevel*/) {
       if (!reset && gFile && !HasVarArrayOfContainers(gFile)) {
          return true;
-      }      
+      }
       Int_t seed = 3 * (entryNumber+1);
       return utility::SetOrVerifyArrVar("fScalarArrVar",fScalarArrVar,fScalarArrVarSize,seed,entryNumber,reset,testname);
    }
@@ -168,7 +168,7 @@ class TEST_MAP_HOLDER : public TObject {
    bool SetOrVerifyScalarPtrArrVar(Int_t entryNumber, bool reset, const std::string &testname, int /*splitlevel*/) {
       if (!reset && gFile && !HasVarArrayOfContainers(gFile)) {
          return true;
-      }      
+      }
       Int_t seed = 6 * (entryNumber+1);
       return utility::SetOrVerifyArrVar("fScalarPtrArrVar",fScalarPtrArrVar,fScalarPtrArrVarSize,seed,entryNumber,reset,testname);
    }
@@ -402,19 +402,19 @@ class TEST_MAP_HOLDER : public TObject {
    }
 
 public:
-   
+
    void Reset(Int_t entryNumber) {
       SetOrVerify(entryNumber, true, "reseting", 0);
    }
-   
+
    bool Verify(Int_t entryNumber, const std::string &testname, int splitlevel) {
       return SetOrVerify(entryNumber,false,testname,splitlevel);
    }
 
 #if defined(R__NO_NESTED_CONTAINER)
-   ClassDef(TEST_MAP_HOLDER,1);
-#else 
-   ClassDef(TEST_MAP_HOLDER,2);
+   ClassDefOverride(TEST_MAP_HOLDER,1);
+#else
+   ClassDefOverride(TEST_MAP_HOLDER,2);
 #endif
 };
 
diff --git a/roottest/root/io/newstl/gsetHolder.h b/roottest/root/io/newstl/gsetHolder.h
diff --git a/roottest/root/io/newstl/sample_bx_classes.C b/roottest/root/io/newstl/sample_bx_classes.C
