Remove __MAKECINT__

root-project · Mar 11, 2024 · c76b8f7 · c76b8f7
1 parent 8a96572
commit c76b8f7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 17 deletions.
diff --git a/core/base/inc/TVirtualPerfStats.h b/core/base/inc/TVirtualPerfStats.h
@@ -93,12 +93,6 @@ class TVirtualPerfStats : public TObject {
    ClassDefOverride(TVirtualPerfStats,0)  // ABC for collecting PROOF statistics
 };
 
-#ifdef __MAKECINT__
-// To properly handle the use of gPerfStats in header files (in static declarations)
-R__EXTERN TVirtualPerfStats *gPerfStats;
-#else
 #define gPerfStats (TVirtualPerfStats::CurrentPerfStats())
-#endif
-
 
 #endif
diff --git a/core/base/src/TStyle.cxx b/core/base/src/TStyle.cxx
@@ -1997,11 +1997,11 @@ void TStyle::SaveSource(const char *filename, Option_t *option)
    char quote = '"';
 
    // Writes include.
-   out << "#if defined (__MAKECINT__)" << std::endl << std::endl;
+   out << std::endl << std::endl;
    out << "#ifndef ROOT_TStyle" << std::endl;
    out << "#include " << quote << "TStyle.h" << quote << std::endl;
    out << "#endif" << std::endl;
-   out << std::endl << "#endif" << std::endl;
+   out << std::endl << std::endl;
 
    // Writes the macro entry point equal to the fname
    out << std::endl;

diff --git a/documentation/doxygen/converttonotebook.py b/documentation/doxygen/converttonotebook.py
@@ -640,7 +640,7 @@ def declareNamespace(code):
 def rs401dGetFiles(code):
     if tutName == "rs401d_FeldmanCousins":
         code = code.replace(
-         """#if defined(__MAKECINT__)\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.h"\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx" // so that it can be executed directly\n#else\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx+" // so that it can be executed directly\n#endif""" , """TString tutDir = gROOT->GetTutorialDir();\nTString headerDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.h\\\"", tutDir.Data());\nTString impDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.cxx\\\"", tutDir.Data());\ngROOT->ProcessLine(headerDir);\ngROOT->ProcessLine(impDir);""")
+         """#include "../tutorials/roostats/NuMuToNuE_Oscillation.h"\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx" // so that it can be executed directly\n#else\n#include "../tutorials/roostats/NuMuToNuE_Oscillation.cxx+" // so that it can be executed directly\n""" , """TString tutDir = gROOT->GetTutorialDir();\nTString headerDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.h\\\"", tutDir.Data());\nTString impDir = TString::Format("#include \\\"%s/roostats/NuMuToNuE_Oscillation.cxx\\\"", tutDir.Data());\ngROOT->ProcessLine(headerDir);\ngROOT->ProcessLine(impDir);""")
     return code
 
 

diff --git a/gui/gui/src/TGFrame.cxx b/gui/gui/src/TGFrame.cxx
@@ -3439,7 +3439,7 @@ void TGTransientFrame::SaveSource(const char *filename, Option_t *option)
    out <<"// By ROOT version "<< gROOT->GetVersion() <<" on "<<t.AsSQLString()<< std::endl;
    out << std::endl;
 
-   out << "#if defined (__MAKECINT__)" << std::endl << std::endl;
+   out << std::endl << std::endl;
 
    TIter nexti(ilist);
    while((inc = (TObjString *)nexti())) {
@@ -3453,7 +3453,7 @@ void TGTransientFrame::SaveSource(const char *filename, Option_t *option)
       }
    }
    out << std::endl << "#include " << quote << "Riostream.h" << quote << std::endl;
-   out << std::endl << "#endif" << std::endl;
+   out << std::endl << std::endl;
    // deletes created ListOfIncludes
    gROOT->GetListOfSpecials()->Remove(ilist);
    ilist->Delete();

diff --git a/io/io/inc/TFile.h b/io/io/inc/TFile.h
@@ -337,12 +337,7 @@ class TFile : public TDirectoryFile {
    ClassDefOverride(TFile,8)  //ROOT file
 };
 
-#ifdef __MAKECINT__
-// To properly handle the use of gFile in header files (in static declarations)
-R__EXTERN TFile   *gFile;
-#else
 #define gFile (TFile::CurrentFile())
-#endif
 
 /**
 \class TFileOpenHandle

diff --git a/math/mathcore/test/stressGoFTest.cxx b/math/mathcore/test/stressGoFTest.cxx
@@ -551,7 +551,7 @@ Int_t stressGoFTest(Int_t argc = 1 , Char_t* argv[] = nullptr) {
    return RunTests(argc, argv);
 }
 
-#if !defined(__MAKECINT__)
+#if !defined(__CLING__)
 Int_t main(Int_t argc, Char_t* argv[]) {
    return RunTests(argc, argv);
 }