[roottest] Attempt at removing no longer needed header guards to fix failing tests

ferdymercury · ferdymercury · commit 86463c658e18 · 2025-09-11T09:04:53.000+02:00
diff --git a/roottest/cling/const/constissue.C b/roottest/cling/const/constissue.C
@@ -16,8 +16,8 @@ class TriggerCharacterizer {
   trigger_counting_map m_map;
 };
 
-#ifdef __CLING__
+//#ifdef __CLING__
 //#pragma link C++ class TriggerCharacterizer::trigger_counting_map;
-#endif
+//#endif
 
 void constissue() {}
diff --git a/roottest/cling/dict/algebra3 b/roottest/cling/dict/algebra3
@@ -18,7 +18,6 @@
 
 namespace aux {
 
-#ifndef __CLING__
   using std::size_t;
   using std::complex;
   using std::istream;
@@ -32,7 +31,6 @@ namespace aux {
   using std::sin;
 //  using std::conj;
   using std::norm;
-#endif /* __CLING__ */
 
   /* ****************** algebra3.h begins here ****************** */
 
@@ -710,7 +708,6 @@ namespace aux {
   //  Implementation
   //
 
-#ifndef __CLING__
 
   /****************************************************************
    *                                                               *
@@ -1999,7 +1996,6 @@ namespace aux {
 		     ((_Tp)0), ((_Tp)0), ((_Tp)1), ((_Tp)0),
 		     ((_Tp)0), ((_Tp)0), ((_Tp)1) / d, ((_Tp)0)); }
 
-#endif /* __CLING__ */
 
   /* ******************* algebra3.h ends here ******************* */
 
@@ -2041,7 +2037,6 @@ namespace aux {
   template<typename _Tp> mat3<_Tp> ExtractRotation(const mat4<_Tp>& pose); // extract rotation matrix from transformation matrix
   template<typename _Tp> typename rtti<_Tp>::value_type PointToPlane(const vec3<_Tp>& point, const vec4<_Tp>& plane); // unsigned distance from a point to a plane (3D)
 
-#ifndef __CLING__
 
   //
   //	rotation2D -- convert 2x2 rotation matrix to 3x3
@@ -2176,7 +2171,6 @@ namespace aux {
     return dist;
   }
 
-#endif /* __CLING__ */
 
 #ifdef fmin
 #undef fmin                 // allow as function names
diff --git a/roottest/cling/dict/runoperators.C b/roottest/cling/dict/runoperators.C
@@ -1,4 +1,4 @@
-#if defined(__CLING__) && !defined(__ROOTCLING__)
+#if defined(__CLING__) && !defined(__ROOTCLING__) && !defined(ClingWorkAroundMissingSmartInclude)
 #include "operators_dict.h+"
 #else 
 #include "operators.h"
diff --git a/roottest/cling/function/CMakeLists.txt b/roottest/cling/function/CMakeLists.txt
@@ -7,7 +7,6 @@ ROOTTEST_ADD_TEST(runoverloadResolution
 ROOTTEST_ADD_TEST(rundefaultParams
                   MACRO rundefaultParams.C
                   OUTREF defaultParams.ref
-                  WILLFAIL
                   LABELS roottest regression cling)
 
 ROOTTEST_ADD_TEST(execrefDefaultParams
diff --git a/roottest/cling/function/Params.h b/roottest/cling/function/Params.h
@@ -1,3 +1,6 @@
+#ifndef PARAMS_H
+#define PARAMS_H
+
 int gCountingCalls = 0;
 
 class Base {
@@ -6,7 +9,7 @@ class Base {
    virtual ~Base(){};
    virtual void FunctionX(int b=0, int c=5) {printf("%s: Base::FunctionX(int b=%d, int c=%d)\n", fMode, b, c);}
 
-   void CINTCannotHandleDefaultArgThatsNotYetParsed(int a = GetCountingCalls()) {};
+   void CINTCannotHandleDefaultArgThatsNotYetParsed(int a = GetCountingCalls()) {(void)a; };
    static int GetCountingCalls() {return ++fgCountingCalls;}
    virtual void FunctionY(int arg0 = ++gCountingCalls, float arg1 = Base::GetCountingCalls() ) {
       printf("%s: Base::FunctionY(int arg0=%d, float arg1=%d.)\n", fMode, arg0, (int)arg1);}
@@ -22,7 +25,9 @@ class Derived: public Base {
  public:
    Derived(const char* mode = ""): Base(mode){};
    virtual ~Derived(){};
-   virtual void FunctionX(int b=1, int c=6) {printf("%s: Derived::FunctionX(int b=%d, int c=%d)\n", fMode, b, c);}
-   virtual void FunctionY(int arg0 = ++gCountingCalls, float arg1 = Base::GetCountingCalls() ) {
+   void FunctionX(int b=1, int c=6) override {printf("%s: Derived::FunctionX(int b=%d, int c=%d)\n", fMode, b, c);}
+   void FunctionY(int arg0 = ++gCountingCalls, float arg1 = Base::GetCountingCalls() ) override {
       printf("%s: Derived::FunctionY(int arg0=%d, float arg1=%d.)\n", fMode, arg0, (int)arg1);}
 };
+
+#endif
diff --git a/roottest/cling/function/testDefaultParams.C b/roottest/cling/function/testDefaultParams.C
@@ -1,6 +1,4 @@
-#ifndef __CLING__
 #include "Params.h"
-#endif
 
 void testDefaultParams(const char* mode) {
    // One object of type Base and one of type derived
diff --git a/roottest/cling/operator/equal.C b/roottest/cling/operator/equal.C
@@ -56,12 +56,16 @@ public:
 class withHiddenRef : public top {
    withHiddenRef &operator=(const withHiddenRef&); // intentionally NOT implemented
    int a;
-#ifndef __CLING__
+#ifdef __CLING__
+public:
+   withHiddenRef(int &) {};
+#else
    const int &ref;
    int &ref2;
-#endif
 public:
    withHiddenRef(int &p) : ref(p),ref2(p) {};
+#endif
+
 };
 
 #ifdef __CLING__
diff --git a/roottest/cling/templateMembers/runoperatorEqual.C b/roottest/cling/templateMembers/runoperatorEqual.C
@@ -1,9 +1,5 @@
 {
 gSystem->Setenv("LINES","-1");
 gROOT->ProcessLine(".L operatorEqual.C+");
-#ifdef __CLING__
-gROOT->ProcessLine(".class StThreeVector");
-#else
 gROOT->ProcessLine(".Class StThreeVector<>");
-#endif
 }
diff --git a/roottest/root/fit/linear/runstoring.C b/roottest/root/fit/linear/runstoring.C
@@ -6,9 +6,6 @@
 
 void writefitter()
 {
-#ifdef __CLING__
-   G__SetCatchException(0);  
-#endif
    Int_t npoints = 100;
    Int_t ndim = 3;
    TFormula *f = new TFormula("f", "x[0]++x[1]++x[2]");
@@ -43,9 +40,6 @@ void writefitter()
 
 void readfitter()
 {
-#ifdef __CLING__
-   // G__SetCatchException(0);
-#endif
    TVectorD vect;  
    TFile *f = TFile::Open("linfitter.root");
    if (!f) return;
@@ -102,9 +96,6 @@ void readfitter()
 
 void writeformula()
 {
-#ifdef __CLING__
-   G__SetCatchException(0);  
-#endif
    TFormula *f = new TFormula("ffffff", "x[0]++x[1]++x[2]");
 
     TFile *file = TFile::Open("formula.root", "RECREATE");
diff --git a/roottest/root/io/buffer/runownership.C b/roottest/root/io/buffer/runownership.C
@@ -3,7 +3,6 @@
 #include "TString.h"
 #include <exception>
 
-#ifndef __CLING__
 class myexception
    {
    public:
@@ -15,7 +14,6 @@ class myexception
          return fMsg.Data();
       }
    };
-#endif
 
 void NonDefaultErrorHandler(Int_t level, Bool_t abort_bool, const char *location, const char *msg)
 {
diff --git a/roottest/root/io/customStreamer/header.h b/roottest/root/io/customStreamer/header.h
@@ -2,9 +2,7 @@
 #include "TClass.h"
 class Hard2Stream {
 private:
-#ifndef __CLING__
    double val;
-#endif
 public:
    Hard2Stream() : val(-1) {};
    Hard2Stream(double v) : val(v) {};
diff --git a/roottest/root/io/datamodelevolution/common/Demangler.h b/roottest/root/io/datamodelevolution/common/Demangler.h
@@ -11,7 +11,7 @@
 #include <typeinfo>
 #include <string>
 
-#if !defined(_WIN32) && !defined(__CLING__)
+#if !defined(_WIN32)
 #include <cxxabi.h>
 #endif
 
diff --git a/roottest/root/tree/selector/execGetSelector.C b/roottest/root/tree/selector/execGetSelector.C
@@ -4,9 +4,7 @@
 #include "TSelector.h"
 #include "TError.h"
 
-#ifndef __CLING__
 #include "emptysel.h"
-#endif
 
 void execGetSelector(string infilename = "Event1.root", int nevents = 10)
 {
diff --git a/roottest/root/tree/stl/runmixing.C b/roottest/root/tree/stl/runmixing.C
@@ -3,7 +3,7 @@
 
 namespace std {}; using namespace std;
 
-#if defined(__CLING__) && !defined(__ROOTCLING__)
+#if defined(__CLING__) && !defined(__ROOTCLING__) && !defined(ClingWorkAroundMissingSmartInclude)
 #include "MyClass.h+"
 #else
 #include "MyClass.h"
diff --git a/roottest/root/treeformula/array/runvectorOfvector.C b/roottest/root/treeformula/array/runvectorOfvector.C
@@ -6,9 +6,7 @@ typedef std::vector<unsigned int> subUCollection;
 typedef std::vector<subUCollection> Ucollection;
 typedef std::vector<int> subCollection;
 typedef std::vector<subCollection> collection;
-#ifndef __CLING__
 typedef std::vector<collection> third;
-#endif
 
 // classZ.vector<vector<int> >      -> 4, t->Draw("vec.fVec1");t->Draw("vec.fVecPtr");
 // vector<classX.vector<classY> > > -> 5, t->Draw("vec.fVec2");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if defined(__CLING__) && !defined(__ROOTCLING__)`
	`1`	`+#if defined(__CLING__) && !defined(__ROOTCLING__) && !defined(ClingWorkAroundMissingSmartInclude)`
`2`	`2`	`#include "operators_dict.h+"`
`3`	`3`	`#else`
`4`	`4`	`#include "operators.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`gSystem->Setenv("LINES","-1");`
`3`	`3`	`gROOT->ProcessLine(".L operatorEqual.C+");`
`4`		`-#ifdef __CLING__`
`5`		`-gROOT->ProcessLine(".class StThreeVector");`
`6`		`-#else`
`7`	`4`	`gROOT->ProcessLine(".Class StThreeVector<>");`
`8`		`-#endif`
`9`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`#include "TString.h"`
`4`	`4`	`#include <exception>`
`5`	`5`
`6`		`-#ifndef __CLING__`
`7`	`6`	`class myexception`
`8`	`7`	`{`
`9`	`8`	`public:`
`@@ -15,7 +14,6 @@ class myexception`
`15`	`14`	`return fMsg.Data();`
`16`	`15`	`}`
`17`	`16`	`};`
`18`		`-#endif`
`19`	`17`
`20`	`18`	`void NonDefaultErrorHandler(Int_t level, Bool_t abort_bool, const char location, const char msg)`
`21`	`19`	`{`