diff --git a/bindings/r/inc/LinkDef.h b/bindings/r/inc/LinkDef.h index 4432d2adfe227..fdac20b588c47 100644 --- a/bindings/r/inc/LinkDef.h +++ b/bindings/r/inc/LinkDef.h @@ -9,7 +9,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/bindings/tpython/inc/LinkDef.h b/bindings/tpython/inc/LinkDef.h index d9a37e469deb4..48e3e57860e1e 100644 --- a/bindings/tpython/inc/LinkDef.h +++ b/bindings/tpython/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/core/base/inc/LinkDef1.h b/core/base/inc/LinkDef1.h index 7b3ee7bd5f199..288954c438b63 100644 --- a/core/base/inc/LinkDef1.h +++ b/core/base/inc/LinkDef1.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/core/base/inc/LinkDef2.h b/core/base/inc/LinkDef2.h index bdaa1013c5f46..4fd5c2e8a31e1 100644 --- a/core/base/inc/LinkDef2.h +++ b/core/base/inc/LinkDef2.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #ifdef __CLING__ #include diff --git a/core/base/inc/LinkDef3.h b/core/base/inc/LinkDef3.h index df4d9c8b265b6..5adf791bafbe7 100644 --- a/core/base/inc/LinkDef3.h +++ b/core/base/inc/LinkDef3.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/core/base/inc/RtypesImp.h b/core/base/inc/RtypesImp.h index 58f536f4f0049..6eac77e8149bd 100644 --- a/core/base/inc/RtypesImp.h +++ b/core/base/inc/RtypesImp.h @@ -44,7 +44,7 @@ inline void operator delete(void*, ROOT::Internal::TOperatorNewHelper*) { } // The STL GenerateInitInstance are not unique and hence are declared static // (not accessible outside the dictionary and not linker error for duplicate) -#if defined(__CINT__) +#if defined(__CLING__) #define RootStlStreamer(name,STREAMER) #else #define RootStlStreamer(name,STREAMER) \ diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx index 992713264a27e..2d788ee3658da 100644 --- a/core/base/src/TApplication.cxx +++ b/core/base/src/TApplication.cxx @@ -1801,12 +1801,12 @@ Longptr_t TApplication::ExecuteFile(const char *file, Int_t *error, Bool_t keep) while (s && (*s == ' ' || *s == '\t')) s++; // strip-off leading blanks // very simple minded pre-processor parsing, only works in case macro file - // starts with "#ifndef __CINT__". In that case everything till next + // starts with "#ifndef __CLING__". In that case everything till next // "#else" or "#endif" will be skipped. if (*s == '#') { char *cs = Compress(currentline); - if (strstr(cs, "#ifndef__CINT__") || - strstr(cs, "#if!defined(__CINT__)")) + if (strstr(cs, "#ifndef__CLING__") || + strstr(cs, "#if!defined(__CLING__)")) ifndefc = 1; else if (ifndefc && (strstr(cs, "#ifdef") || strstr(cs, "#ifndef") || strstr(cs, "#ifdefined") || strstr(cs, "#if!defined"))) diff --git a/core/base/src/TSystem.cxx b/core/base/src/TSystem.cxx index 57cdb89b6667b..11f0ad4d1bb39 100644 --- a/core/base/src/TSystem.cxx +++ b/core/base/src/TSystem.cxx @@ -3437,7 +3437,7 @@ int TSystem::CompileMacro(const char *filename, Option_t *opt, linkdefFile << "// File Automatically generated by the ROOT Script Compiler " << std::endl; linkdefFile << std::endl; - linkdefFile << "#ifdef __CINT__" << std::endl; + linkdefFile << "#ifdef __CLING__" << std::endl; linkdefFile << std::endl; linkdefFile << "#pragma link C++ nestedclasses;" << std::endl; linkdefFile << "#pragma link C++ nestedtypedefs;" << std::endl; diff --git a/core/clingutils/src/multimap2Linkdef.h b/core/clingutils/src/multimap2Linkdef.h index d430084dd081c..ea66e9b850032 100644 --- a/core/clingutils/src/multimap2Linkdef.h +++ b/core/clingutils/src/multimap2Linkdef.h @@ -1,5 +1,5 @@ // For backward compatibility only -#ifdef __CINT__ +#ifdef __CLING__ #include #else #include diff --git a/core/clingutils/src/multimapLinkdef.h b/core/clingutils/src/multimapLinkdef.h index 4b95e7f232c02..70a0547acfc57 100644 --- a/core/clingutils/src/multimapLinkdef.h +++ b/core/clingutils/src/multimapLinkdef.h @@ -1,5 +1,5 @@ // For backward compatibility only -#ifdef __CINT__ +#ifdef __CLING__ #include #else #include diff --git a/core/clingutils/src/multisetLinkdef.h b/core/clingutils/src/multisetLinkdef.h index f051ebba1b4d3..f15d0b1541fce 100644 --- a/core/clingutils/src/multisetLinkdef.h +++ b/core/clingutils/src/multisetLinkdef.h @@ -1,5 +1,5 @@ // For backward compatibility only -#ifdef __CINT__ +#ifdef __CLING__ #include #else #include diff --git a/core/cont/inc/LinkDef.h b/core/cont/inc/LinkDef.h index 5df7bfd611661..bd9214c2eb2ff 100644 --- a/core/cont/inc/LinkDef.h +++ b/core/cont/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ global kIterForward; #pragma link C++ global kIterBackward; diff --git a/core/dictgen/src/rootcling_impl.cxx b/core/dictgen/src/rootcling_impl.cxx index 4b9a3a2c22d35..731a7a912850e 100644 --- a/core/dictgen/src/rootcling_impl.cxx +++ b/core/dictgen/src/rootcling_impl.cxx @@ -1848,7 +1848,7 @@ void CallWriteStreamer(const ROOT::TMetaUtils::AnnotatedRecordDecl &cl, void GenerateLinkdef(llvm::cl::list &InputFiles, std::string &code_for_parser) { - code_for_parser += "#ifdef __CINT__\n\n"; + code_for_parser += "#ifdef __CLING__\n\n"; code_for_parser += "#pragma link off all globals;\n"; code_for_parser += "#pragma link off all classes;\n"; code_for_parser += "#pragma link off all functions;\n\n"; diff --git a/core/macosx/inc/LinkDef.h b/core/macosx/inc/LinkDef.h index e924064d7c52e..a9719adfc2e15 100644 --- a/core/macosx/inc/LinkDef.h +++ b/core/macosx/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/core/meta/inc/LinkDef.h b/core/meta/inc/LinkDef.h index 68aa95e68158e..cf735da2b0c47 100644 --- a/core/meta/inc/LinkDef.h +++ b/core/meta/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ nestedtypedefs; #pragma link C++ nestedclasses; diff --git a/core/rint/inc/LinkDef.h b/core/rint/inc/LinkDef.h index 6904eb21e5837..b4ab41ac470e7 100644 --- a/core/rint/inc/LinkDef.h +++ b/core/rint/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/core/thread/inc/LinkDef.h b/core/thread/inc/LinkDef.h index f5b9c5c52f5e5..a874580198b23 100644 --- a/core/thread/inc/LinkDef.h +++ b/core/thread/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/core/unix/inc/LinkDef.h b/core/unix/inc/LinkDef.h index b62af47c4a59c..e187a4273198e 100644 --- a/core/unix/inc/LinkDef.h +++ b/core/unix/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/core/winnt/inc/LinkDef.h b/core/winnt/inc/LinkDef.h index a2e7f8c096b42..9c190b3e40c49 100644 --- a/core/winnt/inc/LinkDef.h +++ b/core/winnt/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/geom/gdml/inc/LinkDef.h b/geom/gdml/inc/LinkDef.h index e0b498b2a1c95..b1d00ddff34f7 100644 --- a/geom/gdml/inc/LinkDef.h +++ b/geom/gdml/inc/LinkDef.h @@ -9,7 +9,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/geom/geom/inc/LinkDef1.h b/geom/geom/inc/LinkDef1.h index 58c2bcb851cf2..4b2a1dbdf932a 100644 --- a/geom/geom/inc/LinkDef1.h +++ b/geom/geom/inc/LinkDef1.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ global gGeoManager; #pragma link C++ global gGeoIdentity; diff --git a/geom/geom/inc/LinkDef2.h b/geom/geom/inc/LinkDef2.h index 1605f5e8abbcf..26b9da83914df 100644 --- a/geom/geom/inc/LinkDef2.h +++ b/geom/geom/inc/LinkDef2.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ class TGeoPatternFinder + ; #pragma link C++ class TGeoPatternX + ; diff --git a/geom/geombuilder/inc/LinkDef.h b/geom/geombuilder/inc/LinkDef.h index cf0c68f58eb89..f32515c0b101c 100644 --- a/geom/geombuilder/inc/LinkDef.h +++ b/geom/geombuilder/inc/LinkDef.h @@ -7,7 +7,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/geom/geompainter/inc/LinkDef.h b/geom/geompainter/inc/LinkDef.h index 4f66975fd9620..2f817b3a978aa 100644 --- a/geom/geompainter/inc/LinkDef.h +++ b/geom/geompainter/inc/LinkDef.h @@ -7,7 +7,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/geom/vecgeom/inc/LinkDef.h b/geom/vecgeom/inc/LinkDef.h index 8fee6b851705f..3d3c69215f023 100644 --- a/geom/vecgeom/inc/LinkDef.h +++ b/geom/vecgeom/inc/LinkDef.h @@ -6,7 +6,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/geom/webviewer/inc/LinkDef.h b/geom/webviewer/inc/LinkDef.h index 5ac12cb44cf06..8411260756a64 100644 --- a/geom/webviewer/inc/LinkDef.h +++ b/geom/webviewer/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/asimage/inc/LinkDef.h b/graf2d/asimage/inc/LinkDef.h index ea51dd8aac886..a3e5ec420f5fe 100644 --- a/graf2d/asimage/inc/LinkDef.h +++ b/graf2d/asimage/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/asimage/inc/LinkDefGui.h b/graf2d/asimage/inc/LinkDefGui.h index dcaedbfbd7adb..27b6184ea3801 100644 --- a/graf2d/asimage/inc/LinkDefGui.h +++ b/graf2d/asimage/inc/LinkDefGui.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/cocoa/inc/LinkDef.h b/graf2d/cocoa/inc/LinkDef.h index e4dfc96198eb8..a15919df626b6 100644 --- a/graf2d/cocoa/inc/LinkDef.h +++ b/graf2d/cocoa/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/fitsio/inc/LinkDef.h b/graf2d/fitsio/inc/LinkDef.h index ae2ac4a2ffda9..71a9d0d566ebd 100644 --- a/graf2d/fitsio/inc/LinkDef.h +++ b/graf2d/fitsio/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/gpad/inc/LinkDef.h b/graf2d/gpad/inc/LinkDef.h index 954ebcf402a08..9c591a7277c92 100644 --- a/graf2d/gpad/inc/LinkDef.h +++ b/graf2d/gpad/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/gpadv7/inc/LinkDef.h b/graf2d/gpadv7/inc/LinkDef.h index 79cb645998dec..f88259615d09a 100644 --- a/graf2d/gpadv7/inc/LinkDef.h +++ b/graf2d/gpadv7/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/graf/inc/LinkDef.h b/graf2d/graf/inc/LinkDef.h index d3d64e08699a5..95f132df5493c 100644 --- a/graf2d/graf/inc/LinkDef.h +++ b/graf2d/graf/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/gviz/inc/LinkDef.h b/graf2d/gviz/inc/LinkDef.h index 4ce7f9700b79c..a891cd5891346 100644 --- a/graf2d/gviz/inc/LinkDef.h +++ b/graf2d/gviz/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/postscript/inc/LinkDef.h b/graf2d/postscript/inc/LinkDef.h index 6c3b934f5f66a..997fc9e2a2426 100644 --- a/graf2d/postscript/inc/LinkDef.h +++ b/graf2d/postscript/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/primitivesv7/inc/LinkDef.h b/graf2d/primitivesv7/inc/LinkDef.h index 0badc6fcb091a..946dc5f2bd771 100644 --- a/graf2d/primitivesv7/inc/LinkDef.h +++ b/graf2d/primitivesv7/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/win32gdk/inc/LinkDef.h b/graf2d/win32gdk/inc/LinkDef.h index 77491340d41ad..46ccd4f1de1d5 100644 --- a/graf2d/win32gdk/inc/LinkDef.h +++ b/graf2d/win32gdk/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/x11/inc/LinkDef.h b/graf2d/x11/inc/LinkDef.h index f9369b22e11d0..534d8cc01c6d0 100644 --- a/graf2d/x11/inc/LinkDef.h +++ b/graf2d/x11/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf2d/x11ttf/inc/LinkDef.h b/graf2d/x11ttf/inc/LinkDef.h index 1e3eee45cbd67..b9fb351d20e69 100644 --- a/graf2d/x11ttf/inc/LinkDef.h +++ b/graf2d/x11ttf/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf3d/csg/inc/LinkDef.h b/graf3d/csg/inc/LinkDef.h index 11845afab7751..3e86797cbf873 100644 --- a/graf3d/csg/inc/LinkDef.h +++ b/graf3d/csg/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf3d/eve7/inc/LinkDef.h b/graf3d/eve7/inc/LinkDef.h index c0945f778ad39..86bb221f8f003 100644 --- a/graf3d/eve7/inc/LinkDef.h +++ b/graf3d/eve7/inc/LinkDef.h @@ -13,7 +13,7 @@ // LinkDef.h - REve objects and services. //============================================================================== -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf3d/g3d/inc/LinkDef.h b/graf3d/g3d/inc/LinkDef.h index 2bfa17169c9a3..b1b33f46f2c5a 100644 --- a/graf3d/g3d/inc/LinkDef.h +++ b/graf3d/g3d/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf3d/gl/inc/LinkDef.h b/graf3d/gl/inc/LinkDef.h index e00840bf5e208..c5e4bb1f71efb 100644 --- a/graf3d/gl/inc/LinkDef.h +++ b/graf3d/gl/inc/LinkDef.h @@ -10,7 +10,7 @@ #include "RConfigure.h" -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf3d/gviz3d/inc/LinkDef.h b/graf3d/gviz3d/inc/LinkDef.h index f62a6c30964e1..4cda2dd909cd1 100644 --- a/graf3d/gviz3d/inc/LinkDef.h +++ b/graf3d/gviz3d/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/graf3d/x3d/inc/LinkDef.h b/graf3d/x3d/inc/LinkDef.h index 5f93ab370382d..f9ff59a74386c 100644 --- a/graf3d/x3d/inc/LinkDef.h +++ b/graf3d/x3d/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/browsable/inc/LinkDef.h b/gui/browsable/inc/LinkDef.h index 3f42a0652a88d..fc4fd589bb8a3 100644 --- a/gui/browsable/inc/LinkDef.h +++ b/gui/browsable/inc/LinkDef.h @@ -6,7 +6,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/browserv7/inc/LinkDef.h b/gui/browserv7/inc/LinkDef.h index 1828184707af6..58e812fd1793a 100644 --- a/gui/browserv7/inc/LinkDef.h +++ b/gui/browserv7/inc/LinkDef.h @@ -6,7 +6,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/fitpanel/inc/LinkDef.h b/gui/fitpanel/inc/LinkDef.h index 8b05027930c3d..5910117847337 100644 --- a/gui/fitpanel/inc/LinkDef.h +++ b/gui/fitpanel/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/fitpanelv7/inc/LinkDef.h b/gui/fitpanelv7/inc/LinkDef.h index ef1a97242f7ab..abe886cfbe17f 100644 --- a/gui/fitpanelv7/inc/LinkDef.h +++ b/gui/fitpanelv7/inc/LinkDef.h @@ -6,7 +6,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ struct ROOT::Experimental::RFitPanelModel+; #pragma link C++ struct ROOT::Experimental::RFitPanelModel::RComboBoxItem+; diff --git a/gui/ged/inc/LinkDef.h b/gui/ged/inc/LinkDef.h index f973839e74573..58906a8e622c7 100644 --- a/gui/ged/inc/LinkDef.h +++ b/gui/ged/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/gui/inc/LinkDef.h b/gui/gui/inc/LinkDef.h index fc0f206181e4c..4b873490fde5c 100644 --- a/gui/gui/inc/LinkDef.h +++ b/gui/gui/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/guibuilder/inc/LinkDef.h b/gui/guibuilder/inc/LinkDef.h index ad0113e17b1ba..c4fe61da9a600 100644 --- a/gui/guibuilder/inc/LinkDef.h +++ b/gui/guibuilder/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/guihtml/inc/LinkDef.h b/gui/guihtml/inc/LinkDef.h index 16cb0a60fbc2b..7f1cc3c970523 100644 --- a/gui/guihtml/inc/LinkDef.h +++ b/gui/guihtml/inc/LinkDef.h @@ -10,7 +10,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/recorder/inc/LinkDef.h b/gui/recorder/inc/LinkDef.h index fe99163be4a07..662038d6a1e0c 100644 --- a/gui/recorder/inc/LinkDef.h +++ b/gui/recorder/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/sessionviewer/inc/LinkDef.h b/gui/sessionviewer/inc/LinkDef.h index 4d93b834db6dc..7896028bca636 100644 --- a/gui/sessionviewer/inc/LinkDef.h +++ b/gui/sessionviewer/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/webdisplay/inc/LinkDef.h b/gui/webdisplay/inc/LinkDef.h index 650c37981931c..2e06dcc4db88c 100644 --- a/gui/webdisplay/inc/LinkDef.h +++ b/gui/webdisplay/inc/LinkDef.h @@ -6,7 +6,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/gui/webgui6/inc/LinkDef.h b/gui/webgui6/inc/LinkDef.h index 463b9891d93d7..e1e4f25b4ddd5 100644 --- a/gui/webgui6/inc/LinkDef.h +++ b/gui/webgui6/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/hist/hbook/inc/LinkDef.h b/hist/hbook/inc/LinkDef.h index bb3aad95f18a1..5b0cf363b74de 100644 --- a/hist/hbook/inc/LinkDef.h +++ b/hist/hbook/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/hist/hist/inc/LinkDef.h b/hist/hist/inc/LinkDef.h index b09e030299824..a02ef04563abf 100644 --- a/hist/hist/inc/LinkDef.h +++ b/hist/hist/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/hist/histdrawv7/inc/LinkDef.h b/hist/histdrawv7/inc/LinkDef.h index d8bdaa2aab7fb..95e83737fcf68 100644 --- a/hist/histdrawv7/inc/LinkDef.h +++ b/hist/histdrawv7/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/hist/histpainter/inc/LinkDef.h b/hist/histpainter/inc/LinkDef.h index 5963d63fdd7f0..97957889fb4d9 100644 --- a/hist/histpainter/inc/LinkDef.h +++ b/hist/histpainter/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/hist/histv7/inc/LinkDef.h b/hist/histv7/inc/LinkDef.h index b30b9062048d8..a05126ce0de0f 100644 --- a/hist/histv7/inc/LinkDef.h +++ b/hist/histv7/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/hist/spectrum/inc/LinkDef.h b/hist/spectrum/inc/LinkDef.h index 7e8ce6dd72b71..6c135902197ea 100644 --- a/hist/spectrum/inc/LinkDef.h +++ b/hist/spectrum/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/hist/spectrumpainter/inc/LinkDef.h b/hist/spectrumpainter/inc/LinkDef.h index 2950b230a36e2..ee31a992a1a71 100644 --- a/hist/spectrumpainter/inc/LinkDef.h +++ b/hist/spectrumpainter/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/hist/unfold/inc/LinkDef.h b/hist/unfold/inc/LinkDef.h index ca6e63144f457..b9629318925de 100644 --- a/hist/unfold/inc/LinkDef.h +++ b/hist/unfold/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/html/inc/LinkDef.h b/html/inc/LinkDef.h index 05898444319e6..6a10b4597d60f 100644 --- a/html/inc/LinkDef.h +++ b/html/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/interpreter/cling/include/cling/cint/multimap b/interpreter/cling/include/cling/cint/multimap index 18c86d00346ce..39d2aa3f37a3d 100644 --- a/interpreter/cling/include/cling/cint/multimap +++ b/interpreter/cling/include/cling/cint/multimap @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #include #else #error "This header (multimap) is only expected to be used when emulating CINT" diff --git a/interpreter/cling/include/cling/cint/multiset b/interpreter/cling/include/cling/cint/multiset index caf66b12dcff4..af7327b15c7c7 100644 --- a/interpreter/cling/include/cling/cint/multiset +++ b/interpreter/cling/include/cling/cint/multiset @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #include #else #error "This header (multiset) is only expected to be used when emulating CINT" diff --git a/io/dcache/inc/LinkDef.h b/io/dcache/inc/LinkDef.h index 849e35ba28546..b810f05a6228a 100644 --- a/io/dcache/inc/LinkDef.h +++ b/io/dcache/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/io/io/inc/LinkDef.h b/io/io/inc/LinkDef.h index 292ba668f49c7..6dd6545d025c5 100644 --- a/io/io/inc/LinkDef.h +++ b/io/io/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/io/io/src/TFile.cxx b/io/io/src/TFile.cxx index 861ae9551f506..d6768fc414ef9 100644 --- a/io/io/src/TFile.cxx +++ b/io/io/src/TFile.cxx @@ -3070,7 +3070,7 @@ void TFile::MakeProject(const char *dirname, const char * /*classes*/, fprintf(fp,"\n"); fprintf(fp,"\n"); } else { - fprintf(fp,"#ifdef __CINT__\n"); + fprintf(fp,"#ifdef __CLING__\n"); fprintf(fp,"\n"); } diff --git a/io/mpi/inc/LinkDef.h b/io/mpi/inc/LinkDef.h index 74fd6232deaf4..7ef763161132a 100644 --- a/io/mpi/inc/LinkDef.h +++ b/io/mpi/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; diff --git a/io/sql/inc/LinkDef.h b/io/sql/inc/LinkDef.h index 78fd6b7346457..36e2080fffad0 100644 --- a/io/sql/inc/LinkDef.h +++ b/io/sql/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ class TSQLFile-; #pragma link C++ class TBufferSQL2; diff --git a/io/xml/inc/LinkDef.h b/io/xml/inc/LinkDef.h index 2e28f6138dfe5..7e8bc25cfac2d 100644 --- a/io/xml/inc/LinkDef.h +++ b/io/xml/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/io/xmlparser/inc/LinkDef.h b/io/xmlparser/inc/LinkDef.h index d87147ab5b9c9..4eb5d28214e0c 100644 --- a/io/xmlparser/inc/LinkDef.h +++ b/io/xmlparser/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/fftw/inc/LinkDef.h b/math/fftw/inc/LinkDef.h index 5a78cd5074c5c..6308e9fad7cae 100644 --- a/math/fftw/inc/LinkDef.h +++ b/math/fftw/inc/LinkDef.h @@ -1,6 +1,6 @@ // @(#)root/fft:$Id$ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; diff --git a/math/foam/inc/LinkDef.h b/math/foam/inc/LinkDef.h index 6ccf0c5a9be7b..3bc79953b0689 100644 --- a/math/foam/inc/LinkDef.h +++ b/math/foam/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/fumili/inc/LinkDef.h b/math/fumili/inc/LinkDef.h index 31378af3fbd08..36db85f187c32 100644 --- a/math/fumili/inc/LinkDef.h +++ b/math/fumili/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/genetic/inc/LinkDef.h b/math/genetic/inc/LinkDef.h index fe0bef03029b1..e10f6e4413300 100644 --- a/math/genetic/inc/LinkDef.h +++ b/math/genetic/inc/LinkDef.h @@ -1,5 +1,5 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; diff --git a/math/genvector/inc/Math/LinkDef_GenVector.h b/math/genvector/inc/Math/LinkDef_GenVector.h index 1cdedb97275f3..e6d80222541d7 100644 --- a/math/genvector/inc/Math/LinkDef_GenVector.h +++ b/math/genvector/inc/Math/LinkDef_GenVector.h @@ -3,7 +3,7 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/genvector/inc/Math/LinkDef_GenVector32.h b/math/genvector/inc/Math/LinkDef_GenVector32.h index 67963c77b0f43..0bff213fda0fd 100644 --- a/math/genvector/inc/Math/LinkDef_GenVector32.h +++ b/math/genvector/inc/Math/LinkDef_GenVector32.h @@ -4,7 +4,7 @@ // Linkdef for Doublr32_t types -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/genvector/test/TrackLinkDef.h b/math/genvector/test/TrackLinkDef.h index cc953a68d58aa..05c0db62968a0 100644 --- a/math/genvector/test/TrackLinkDef.h +++ b/math/genvector/test/TrackLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; diff --git a/math/mathcore/inc/LinkDef1.h b/math/mathcore/inc/LinkDef1.h index 11e338afa22bb..2f6165d6f34a2 100644 --- a/math/mathcore/inc/LinkDef1.h +++ b/math/mathcore/inc/LinkDef1.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ nestedtypedefs; #pragma link C++ nestedclasses; diff --git a/math/mathcore/inc/LinkDef2.h b/math/mathcore/inc/LinkDef2.h index 4ac1d929c146b..407798b021435 100644 --- a/math/mathcore/inc/LinkDef2.h +++ b/math/mathcore/inc/LinkDef2.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ nestedclass; #pragma link C++ nestedtypedef; diff --git a/math/mathcore/inc/LinkDef3.h b/math/mathcore/inc/LinkDef3.h index 16006bc20f7b6..4abadfedf44d1 100644 --- a/math/mathcore/inc/LinkDef3.h +++ b/math/mathcore/inc/LinkDef3.h @@ -7,7 +7,7 @@ * * **********************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ namespace ROOT::Fit; diff --git a/math/mathcore/inc/LinkDef_Func.h b/math/mathcore/inc/LinkDef_Func.h index 1f4c2f42d601a..2c22fb166af23 100644 --- a/math/mathcore/inc/LinkDef_Func.h +++ b/math/mathcore/inc/LinkDef_Func.h @@ -7,7 +7,7 @@ * * * * **********************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ // special functionses diff --git a/math/mathmore/inc/Math/LinkDef.h b/math/mathmore/inc/Math/LinkDef.h index d7edf414c0add..f3b5281e94486 100644 --- a/math/mathmore/inc/Math/LinkDef.h +++ b/math/mathmore/inc/Math/LinkDef.h @@ -3,7 +3,7 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma extra_include "Math/IFunctionfwd.h"; #pragma extra_include "Math/IFunction.h"; @@ -107,4 +107,4 @@ #pragma link C++ class ROOT::Math::GSLMultiRootFinder+; #pragma link C++ typedef ROOT::Math::MultiRootFinder; -#endif //__CINT__ +#endif //__CLING__ diff --git a/math/mathmore/inc/Math/LinkDef_Func.h b/math/mathmore/inc/Math/LinkDef_Func.h index 3a60da99101db..503383e7d581a 100644 --- a/math/mathmore/inc/Math/LinkDef_Func.h +++ b/math/mathmore/inc/Math/LinkDef_Func.h @@ -1,7 +1,7 @@ // @(#)root/mathmore:$Id$ // Authors: L. Moneta, A. Zsenei 08/2005 -#ifdef __CINT__ +#ifdef __CLING__ // special functions diff --git a/math/mathmore/inc/Math/LinkDef_RootFinding.h b/math/mathmore/inc/Math/LinkDef_RootFinding.h index 7fc3c084949f7..7a7ac5fcc8b5b 100644 --- a/math/mathmore/inc/Math/LinkDef_RootFinding.h +++ b/math/mathmore/inc/Math/LinkDef_RootFinding.h @@ -1,7 +1,7 @@ // @(#)root/mathmore:$Id$ // Authors: L. Moneta, A. Zsenei 08/2005 -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ namespace ROOT::Math::Roots; diff --git a/math/matrix/inc/LinkDef.h b/math/matrix/inc/LinkDef.h index 145f052d22dce..3a196fdb534af 100644 --- a/math/matrix/inc/LinkDef.h +++ b/math/matrix/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/minuit/inc/LinkDef.h b/math/minuit/inc/LinkDef.h index 7a0b9392e9c66..adcf1c75457f4 100644 --- a/math/minuit/inc/LinkDef.h +++ b/math/minuit/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/minuit2/inc/LinkDef.h b/math/minuit2/inc/LinkDef.h index ecc5df7cdfd1b..5e64116956b5b 100644 --- a/math/minuit2/inc/LinkDef.h +++ b/math/minuit2/inc/LinkDef.h @@ -7,7 +7,7 @@ * * **********************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/minuit2/test/testUserFunc.cxx b/math/minuit2/test/testUserFunc.cxx index 7a84038d1e909..af500dd10922a 100644 --- a/math/minuit2/test/testUserFunc.cxx +++ b/math/minuit2/test/testUserFunc.cxx @@ -54,7 +54,7 @@ void testUserFunc(std::string type = "Minuit2", int n = 1000) h1->Draw(); } -#ifndef __CINT__ +#ifndef __CLING__ int main(int argc, char **argv) { if (argc > 1) { @@ -67,7 +67,7 @@ int main(int argc, char **argv) } #endif -//#ifndef __CINT__ +//#ifndef __CLING__ // int main() { // testUserFunc( ); //} diff --git a/math/mlp/inc/LinkDef.h b/math/mlp/inc/LinkDef.h index 157cbeb0b7f78..970d3b9020073 100644 --- a/math/mlp/inc/LinkDef.h +++ b/math/mlp/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; diff --git a/math/physics/inc/LinkDef.h b/math/physics/inc/LinkDef.h index 803b7a8dce737..bdf7831631d22 100644 --- a/math/physics/inc/LinkDef.h +++ b/math/physics/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/quadp/inc/LinkDef.h b/math/quadp/inc/LinkDef.h index 0816e3efa368f..42e218163b439 100644 --- a/math/quadp/inc/LinkDef.h +++ b/math/quadp/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/rtools/inc/LinkDef.h b/math/rtools/inc/LinkDef.h index 1b74056a95067..b2cd34c60ed1d 100644 --- a/math/rtools/inc/LinkDef.h +++ b/math/rtools/inc/LinkDef.h @@ -1,5 +1,5 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; diff --git a/math/smatrix/inc/LinkDef.h b/math/smatrix/inc/LinkDef.h index 928049186752b..bade0e928d4bd 100644 --- a/math/smatrix/inc/LinkDef.h +++ b/math/smatrix/inc/LinkDef.h @@ -4,7 +4,7 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/smatrix/inc/LinkDefD32.h b/math/smatrix/inc/LinkDefD32.h index 8309f6263aae3..76b5f36235fbb 100644 --- a/math/smatrix/inc/LinkDefD32.h +++ b/math/smatrix/inc/LinkDefD32.h @@ -4,7 +4,7 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/math/smatrix/test/TrackLinkDef.h b/math/smatrix/test/TrackLinkDef.h index 8e56433006723..4ade307b27737 100644 --- a/math/smatrix/test/TrackLinkDef.h +++ b/math/smatrix/test/TrackLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; diff --git a/math/splot/inc/LinkDef.h b/math/splot/inc/LinkDef.h index e2240dad05046..cfdd033da09d4 100644 --- a/math/splot/inc/LinkDef.h +++ b/math/splot/inc/LinkDef.h @@ -1,5 +1,5 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; diff --git a/math/unuran/inc/LinkDef.h b/math/unuran/inc/LinkDef.h index e3d41e513534c..727e6c2bc03f2 100644 --- a/math/unuran/inc/LinkDef.h +++ b/math/unuran/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/montecarlo/eg/inc/LinkDef.h b/montecarlo/eg/inc/LinkDef.h index ed402a118c3c0..4f2b137bbbddd 100644 --- a/montecarlo/eg/inc/LinkDef.h +++ b/montecarlo/eg/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/montecarlo/pythia8/inc/LinkDef.h b/montecarlo/pythia8/inc/LinkDef.h index 55ba571b1f21b..2367aa06b31b3 100644 --- a/montecarlo/pythia8/inc/LinkDef.h +++ b/montecarlo/pythia8/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/net/auth/inc/LinkDefRoot.h b/net/auth/inc/LinkDefRoot.h index 8f018095eb52d..3ac609bc9e781 100644 --- a/net/auth/inc/LinkDefRoot.h +++ b/net/auth/inc/LinkDefRoot.h @@ -6,7 +6,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/net/davix/inc/LinkDef.h b/net/davix/inc/LinkDef.h index f99b1c497f1b4..0eeee2dab9831 100644 --- a/net/davix/inc/LinkDef.h +++ b/net/davix/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/net/http/inc/LinkDef.h b/net/http/inc/LinkDef.h index ad97f11d7ccbf..a0c69be29b4bb 100644 --- a/net/http/inc/LinkDef.h +++ b/net/http/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/net/httpsniff/inc/LinkDef.h b/net/httpsniff/inc/LinkDef.h index eb3e70a6bd1ed..7546cc6e0e514 100644 --- a/net/httpsniff/inc/LinkDef.h +++ b/net/httpsniff/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/net/net/inc/LinkDef.h b/net/net/inc/LinkDef.h index 5361e8e67efe7..d3e575916719a 100644 --- a/net/net/inc/LinkDef.h +++ b/net/net/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ enum EMessageTypes; #pragma link C++ enum ESockOptions; diff --git a/net/netxng/inc/LinkDef.h b/net/netxng/inc/LinkDef.h index cd89ef8a47d00..a9d2e2f3a9bd6 100644 --- a/net/netxng/inc/LinkDef.h +++ b/net/netxng/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/proof/proof/inc/LinkDef.h b/proof/proof/inc/LinkDef.h index 6b75ebb916fd6..9e98d672ed3a1 100644 --- a/proof/proof/inc/LinkDef.h +++ b/proof/proof/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/proof/proofbench/inc/LinkDef.h b/proof/proofbench/inc/LinkDef.h index f54431f2f8682..9496be64c47d3 100644 --- a/proof/proofbench/inc/LinkDef.h +++ b/proof/proofbench/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/proof/proofplayer/inc/LinkDef.h b/proof/proofplayer/inc/LinkDef.h index 6134745cf4fd9..0815cda1f5786 100644 --- a/proof/proofplayer/inc/LinkDef.h +++ b/proof/proofplayer/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/proof/proofplayer/inc/LinkDefDraw.h b/proof/proofplayer/inc/LinkDefDraw.h index 924a2feb28654..e717fd06d0171 100644 --- a/proof/proofplayer/inc/LinkDefDraw.h +++ b/proof/proofplayer/inc/LinkDefDraw.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/roofit/RDataFrameHelpers/inc/LinkDef.h b/roofit/RDataFrameHelpers/inc/LinkDef.h index f1ba0bac09a67..b8f7a8c8dd7d4 100644 --- a/roofit/RDataFrameHelpers/inc/LinkDef.h +++ b/roofit/RDataFrameHelpers/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/roofit/histfactory/inc/LinkDef.h b/roofit/histfactory/inc/LinkDef.h index 8f6523e796b4f..fe50583ca1aa2 100644 --- a/roofit/histfactory/inc/LinkDef.h +++ b/roofit/histfactory/inc/LinkDef.h @@ -1,6 +1,6 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; diff --git a/roofit/roofit/inc/LinkDef1.h b/roofit/roofit/inc/LinkDef1.h index 2cedc73fdd56c..3611803469c5f 100644 --- a/roofit/roofit/inc/LinkDef1.h +++ b/roofit/roofit/inc/LinkDef1.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; diff --git a/roofit/roofitcore/inc/LinkDef.h b/roofit/roofitcore/inc/LinkDef.h index 88ad0ca6c90c3..385f704778640 100644 --- a/roofit/roofitcore/inc/LinkDef.h +++ b/roofit/roofitcore/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ //Old LinkDef1.h #pragma link off all globals; diff --git a/roofit/roofitcore/test/stressRooFit.cxx b/roofit/roofitcore/test/stressRooFit.cxx index 48ded3042e957..9fca9cb395a5e 100644 --- a/roofit/roofitcore/test/stressRooFit.cxx +++ b/roofit/roofitcore/test/stressRooFit.cxx @@ -216,7 +216,7 @@ int stressRooFit(const char *refFile, bool writeRef, int doVerbose, int oneTest, printf("******************************************************************\n"); gBenchmark->Print("StressFit"); -#ifdef __CINT__ +#ifdef __CLING__ Double_t reftime = 186.34; // pcbrun4 interpreted #else Double_t reftime = 93.59; // pcbrun4 compiled @@ -242,7 +242,7 @@ int stressRooFit(const char *refFile, bool writeRef, int doVerbose, int oneTest, } //_____________________________batch only_____________________ -#ifndef __CINT__ +#ifndef __CLING__ int main(int argc, const char *argv[]) { diff --git a/roofit/roofitmore/inc/LinkDef.h b/roofit/roofitmore/inc/LinkDef.h index 72d76939d3b66..1a4c3859f7230 100644 --- a/roofit/roofitmore/inc/LinkDef.h +++ b/roofit/roofitmore/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; diff --git a/roofit/roostats/inc/LinkDef.h b/roofit/roostats/inc/LinkDef.h index f9d4466905375..9dc000f37eafd 100644 --- a/roofit/roostats/inc/LinkDef.h +++ b/roofit/roostats/inc/LinkDef.h @@ -8,7 +8,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/roofit/roostats/test/stressRooStats.cxx b/roofit/roostats/test/stressRooStats.cxx index a50d8ad535377..2685d3e0f5485 100644 --- a/roofit/roostats/test/stressRooStats.cxx +++ b/roofit/roostats/test/stressRooStats.cxx @@ -255,7 +255,7 @@ int stressRooStats(const char *refFile, bool writeRef, int verbose, bool allTest cout << setw(lineWidth) << setfill('*') << "" << endl; gBenchmark->Print("stressRooStats"); -#ifdef __CINT__ +#ifdef __CLING__ Double_t reftime = 186.34; // pcbrun4 interpreted #else Double_t reftime = 93.59; // pcbrun4 compiled @@ -297,7 +297,7 @@ int stressRooStats(const char *refFile, bool writeRef, int verbose, bool allTest } //_____________________________batch only_____________________ -#ifndef __CINT__ +#ifndef __CLING__ int main(int argc, const char *argv[]) { diff --git a/roofit/xroofit/inc/LinkDef.h b/roofit/xroofit/inc/LinkDef.h index b77031b60ea20..11d4a7895fd9e 100644 --- a/roofit/xroofit/inc/LinkDef.h +++ b/roofit/xroofit/inc/LinkDef.h @@ -10,7 +10,7 @@ * listed in LICENSE (http://roofit.sourceforge.net/license.txt) */ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/sql/mysql/inc/LinkDef.h b/sql/mysql/inc/LinkDef.h index 7e5dde8a22de3..65b5f66434f36 100644 --- a/sql/mysql/inc/LinkDef.h +++ b/sql/mysql/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/sql/odbc/inc/LinkDef.h b/sql/odbc/inc/LinkDef.h index fdf0afd725a22..a50e66e3b25a8 100644 --- a/sql/odbc/inc/LinkDef.h +++ b/sql/odbc/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/sql/pgsql/inc/LinkDef.h b/sql/pgsql/inc/LinkDef.h index cfc5fafea7a50..11edd53db6073 100644 --- a/sql/pgsql/inc/LinkDef.h +++ b/sql/pgsql/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/sql/sqlite/inc/LinkDef.h b/sql/sqlite/inc/LinkDef.h index d270ab672e7cd..7025a094c7da5 100644 --- a/sql/sqlite/inc/LinkDef.h +++ b/sql/sqlite/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/test/EventLinkDef.h b/test/EventLinkDef.h index c12066a7ab191..7a3241f6c8069 100644 --- a/test/EventLinkDef.h +++ b/test/EventLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/test/RootIDE/LinkDef.h b/test/RootIDE/LinkDef.h index 31dec99c21ec1..062a696b5f734 100644 --- a/test/RootIDE/LinkDef.h +++ b/test/RootIDE/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/test/RootShower/RSLinkDef.h b/test/RootShower/RSLinkDef.h index 1b0d00dc47a30..e8de79d46c497 100644 --- a/test/RootShower/RSLinkDef.h +++ b/test/RootShower/RSLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/test/TestVectors.cxx b/test/TestVectors.cxx index 4d968b546bf88..2b7588a738e54 100644 --- a/test/TestVectors.cxx +++ b/test/TestVectors.cxx @@ -1,7 +1,7 @@ // @(#)root/test:$Id$ // Author: Peter Malzacher 19/06/99 -#ifndef __CINT__ +#ifndef __CLING__ #include #include #include diff --git a/test/TrackMathCoreLinkDef.h b/test/TrackMathCoreLinkDef.h index 93c7f3743cd99..eb5ca3528272a 100644 --- a/test/TrackMathCoreLinkDef.h +++ b/test/TrackMathCoreLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; diff --git a/test/benchLinkDef.h b/test/benchLinkDef.h index e2f925a40b4ff..370dceb376446 100644 --- a/test/benchLinkDef.h +++ b/test/benchLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/test/dt_MakeRef.C b/test/dt_MakeRef.C index e3afe851da68e..2052d10fc4ea7 100644 --- a/test/dt_MakeRef.C +++ b/test/dt_MakeRef.C @@ -7,7 +7,7 @@ #include "TH2.h" #include "TSystem.h" -#ifndef __CINT__ +#ifndef __CLING__ #include "Event.h" #endif diff --git a/test/guiviewerLinkDef.h b/test/guiviewerLinkDef.h index bd6b57028a598..9af7fd95a8f92 100644 --- a/test/guiviewerLinkDef.h +++ b/test/guiviewerLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/test/histviewer/LinkDef.h b/test/histviewer/LinkDef.h index 9a975ad567257..5b144d5e96819 100644 --- a/test/histviewer/LinkDef.h +++ b/test/histviewer/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/test/hsimple.cxx b/test/hsimple.cxx index 566bde29525f6..e6d345df243cf 100644 --- a/test/hsimple.cxx +++ b/test/hsimple.cxx @@ -16,7 +16,7 @@ int hsimple(); -#ifndef __CINT__ +#ifndef __CLING__ #include "TFile.h" #include "TH1.h" #include "TH2.h" diff --git a/test/minexam.cxx b/test/minexam.cxx index 9f98e10b77c44..3f9a46ac3f4a8 100644 --- a/test/minexam.cxx +++ b/test/minexam.cxx @@ -23,7 +23,7 @@ void fcnk0(int &npar, double *gin, double &f, double *x, int iflag); int minexam(); -#ifndef __CINT__ +#ifndef __CLING__ #include "TVirtualFitter.h" #include "TMath.h" #include "TStopwatch.h" diff --git a/test/periodic/NdbLinkDef.h b/test/periodic/NdbLinkDef.h index ff44194b625ff..e5cec269cacc1 100644 --- a/test/periodic/NdbLinkDef.h +++ b/test/periodic/NdbLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/test/rhtml/LinkDef.h b/test/rhtml/LinkDef.h index 5a788d8c1ebde..cbd0f8db7c7fb 100644 --- a/test/rhtml/LinkDef.h +++ b/test/rhtml/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/test/stress.cxx b/test/stress.cxx index 77f48d43b80d2..2d0f36da6584f 100644 --- a/test/stress.cxx +++ b/test/stress.cxx @@ -68,7 +68,7 @@ //****************************************************************** // //_____________________________batch only_____________________ -#ifndef __CINT__ +#ifndef __CLING__ #include #include @@ -221,7 +221,7 @@ void stress(Int_t nevent, Int_t style = 1, Float_t mbtot1 = mbin1+mbout1; printf("stress : Compr I/O =%7.1f Mbytes, I =%7.1f, O =%6.1f\n",mbtot1,mbin1,mbout1); gBenchmark->Print("stress"); -#ifndef __CINT__ +#ifndef __CLING__ Float_t cp_brun_30 = 12.73; Float_t cp_brun_1000 = 61.88; #else diff --git a/test/stressEntryList.cxx b/test/stressEntryList.cxx index 42d935efbe49b..878529d77245a 100644 --- a/test/stressEntryList.cxx +++ b/test/stressEntryList.cxx @@ -672,7 +672,7 @@ Int_t stressEntryList(Int_t nentries, Int_t nfiles) return retval; } //_____________________________batch only_____________________ -#ifndef __CINT__ +#ifndef __CLING__ int main(int argc, char *argv[]) { diff --git a/test/stressFit.cxx b/test/stressFit.cxx index 80bbd0200f29c..c52997a7c0234 100644 --- a/test/stressFit.cxx +++ b/test/stressFit.cxx @@ -659,7 +659,7 @@ Int_t stressFit(const char *type, const char *algo, Int_t N) printf("******************************************************************\n"); gBenchmark->Print("stressFit"); -#ifdef __CINT__ +#ifdef __CLING__ Double_t reftime = 86.34; //macbrun interpreted #else Double_t reftime = 12.07; //macbrun compiled @@ -675,7 +675,7 @@ Int_t stressFit(const char *type, const char *algo, Int_t N) } //_____________________________batch only_____________________ -#ifndef __CINT__ +#ifndef __CLING__ int main(int argc,const char *argv[]) { diff --git a/test/stressGeometry.cxx b/test/stressGeometry.cxx index f8d78f4f54649..209b280813149 100644 --- a/test/stressGeometry.cxx +++ b/test/stressGeometry.cxx @@ -57,7 +57,7 @@ Double_t tpstot = 0; Double_t tpsref = 112.1; //time including the generation of the ref files Bool_t testfailed = kFALSE; -#ifndef __CINT__ +#ifndef __CLING__ void stressGeometry(const char*, Bool_t, Bool_t); int main(int argc, char **argv) diff --git a/test/stressIOPlugins.cxx b/test/stressIOPlugins.cxx index c391e26616334..8aa64734a0ffb 100644 --- a/test/stressIOPlugins.cxx +++ b/test/stressIOPlugins.cxx @@ -53,7 +53,7 @@ // : filename with a url query in Add...................... OK // **************************************************************************** //_____________________________batch only_____________________ -#ifndef __CINT__ +#ifndef __CLING__ #include #include diff --git a/test/stressInterpreter.cxx b/test/stressInterpreter.cxx index 212acd47048cd..83261748dd13b 100644 --- a/test/stressInterpreter.cxx +++ b/test/stressInterpreter.cxx @@ -440,7 +440,7 @@ bool stressInterpreter(Int_t ntimes = 10, const char* runTests = 0, const char* return !stress.run(ntimes, runTests); } -#if !defined(__CINT__) && !defined(__CLING__) +#if !defined(__CLING__) // If compiled: interpret! (by default) int main(int argc, char **argv) diff --git a/test/stressLinear.cxx b/test/stressLinear.cxx index 5169f8bd7ed27..7dc510d4c5285 100644 --- a/test/stressLinear.cxx +++ b/test/stressLinear.cxx @@ -169,7 +169,7 @@ void stress_backward_io (); void cleanup (); //_____________________________batch only_____________________ -#ifndef __CINT__ +#ifndef __CLING__ int main(int argc,const char *argv[]) { @@ -224,7 +224,7 @@ void stressLinear(Int_t maxSizeReq,Int_t verbose) mstress_binary_ebe_op(maxSize/2,maxSize); mstress_transposition(maxSize); mstress_special_creation(maxSize); -#ifndef __CINT__ +#ifndef __CLING__ mstress_matrix_promises(maxSize); #endif mstress_norms(maxSize,maxSize/2); @@ -452,7 +452,7 @@ void mstress_matrix_fill(Int_t rsize,Int_t csize) if (gVerbose) std::cout << "Creating m with Apply function..." << std::endl; TMatrixD m(-1,rsize-2,1,csize); -#ifndef __CINT__ +#ifndef __CLING__ FillMatrix f(m); m.Apply(f); #else @@ -726,7 +726,7 @@ void mstress_element_op(Int_t rsize,Int_t csize) if (gVerbose) std::cout << "\nCheck out to see that sin^2(x) + cos^2(x) = 1" << std::endl; { -#ifndef __CINT__ +#ifndef __CLING__ FillMatrix f(m); m.Apply(f); #else @@ -737,7 +737,7 @@ void mstress_element_op(Int_t rsize,Int_t csize) } m1 = m; { -#ifndef __CINT__ +#ifndef __CLING__ ApplyFunction s(&TMath::Sin); ApplyFunction c(&TMath::Cos); m.Apply(s); @@ -926,7 +926,7 @@ class MakeHilbert : public TElementPosActionD { MakeHilbert() { } }; -#if !defined (__CINT__) || defined (__MAKECINT__) +#if !defined (__CLING__) || defined (__MAKECLING__) class TestUnit : public TElementPosActionD { mutable Int_t fIsUnit; void Operation(Double_t &element) const override @@ -961,7 +961,7 @@ void mstress_special_creation(Int_t dim) TMatrixD m1(TMatrixD::kZero,m); ok &= ( !(m == m1) ) ? kTRUE : kFALSE; ok &= ( m != 0 ) ? kTRUE : kFALSE; -#ifndef __CINT__ +#ifndef __CLING__ MakeHilbert mh; m1.Apply(mh); #else @@ -989,7 +989,7 @@ void mstress_special_creation(Int_t dim) if (gVerbose) std::cout << "test creating unit matrices" << std::endl; TMatrixD m(dim,dim); -#ifndef __CINT__ +#ifndef __CLING__ { TestUnit test_unit; m.Apply(test_unit); @@ -999,7 +999,7 @@ void mstress_special_creation(Int_t dim) ok &= ( !is_indeed_unit(m) ) ? kTRUE : kFALSE; #endif m.UnitMatrix(); -#ifndef __CINT__ +#ifndef __CLING__ { TestUnit test_unit; m.Apply(test_unit); @@ -1010,7 +1010,7 @@ void mstress_special_creation(Int_t dim) #endif m.ResizeTo(dim-1,dim); TMatrixD m2(TMatrixD::kUnit,m); -#ifndef __CINT__ +#ifndef __CLING__ { TestUnit test_unit; m2.Apply(test_unit); @@ -1021,7 +1021,7 @@ void mstress_special_creation(Int_t dim) #endif m.ResizeTo(dim,dim-2); m.UnitMatrix(); -#ifndef __CINT__ +#ifndef __CLING__ { TestUnit test_unit; m.Apply(test_unit); @@ -1071,7 +1071,7 @@ void mstress_special_creation(Int_t dim) StatusPrint(6,"Haar/Hilbert Matrix",ok); } -#ifndef __CINT__ +#ifndef __CLING__ // //------------------------------------------------------------------------ // Test matrix promises @@ -1525,7 +1525,7 @@ void mstress_mm_multiplications() ok &= VerifyMatrixIdentity(mm1,mm2,verbose,epsilon); } -#ifndef __CINT__ +#ifndef __CLING__ if (nr >= Int_t(1.0e+5/msize/msize)) { #else if (nr >= Int_t(1.0e+3/msize/msize)) { @@ -1869,7 +1869,7 @@ void mstress_vm_multiplications() ok &= VerifyMatrixIdentity(mvb,mvm,verbose,epsilon); } -#ifndef __CINT__ +#ifndef __CLING__ if (nr >= Int_t(1.0e+5/msize/msize)) { #else if (nr >= Int_t(1.0e+3/msize/msize)) { @@ -1999,7 +1999,7 @@ void mstress_inversion() ok &= VerifyMatrixIdentity(mmi,unit,verbose,epsilon); } -#ifndef __CINT__ +#ifndef __CLING__ if (nr >= Int_t(1.0e+5/msize/msize)) { #else if (nr >= Int_t(1.0e+3/msize/msize)) { @@ -2860,7 +2860,7 @@ void spstress_mm_multiplications() ok &= VerifyMatrixIdentity(m,mp3,verbose,epsilon); } -#ifndef __CINT__ +#ifndef __CLING__ if (nr >= Int_t(1.0e+5/msize/msize)) { #else if (nr >= Int_t(1.0e+3/msize/msize)) { @@ -2992,7 +2992,7 @@ void spstress_vm_multiplications() ok &= VerifyMatrixIdentity(mvb,mvm,verbose,epsilon); } -#ifndef __CINT__ +#ifndef __CLING__ if (nr >= Int_t(1.0e+5/msize/msize)) { #else if (nr >= Int_t(1.0e+3/msize/msize)) { @@ -3369,7 +3369,7 @@ void vstress_element_op(Int_t vsize) std::cout << "\nCheck out to see that sin^2(x) + cos^2(x) = 1" << std::endl; for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++) v(i) = 2*TMath::Pi()/v.GetNoElements()*i; -#ifndef __CINT__ +#ifndef __CLING__ SinAction s; v.Apply(s); CosAction c(v.GetNoElements()); @@ -3390,7 +3390,7 @@ void vstress_element_op(Int_t vsize) if (gVerbose) std::cout << "\nVerify constructor with initialization" << std::endl; -#ifndef __CINT__ +#ifndef __CLING__ TVectorD vi(0,4,0.0,1.0,2.0,3.0,4.0,"END"); #else Double_t vval[] = {0.0,1.0,2.0,3.0,4.0}; @@ -3877,7 +3877,7 @@ Bool_t test_svd_expansion(const TMatrixD &A) return ok; } -#ifndef __CINT__ +#ifndef __CLING__ // Make a matrix from an array (read it row-by-row) class MakeMatrix : public TMatrixDLazy { const Double_t *array; @@ -4112,7 +4112,7 @@ void astress_lineqn() ok &= VerifyVectorValue(b1,1.0,verbose,msize*EPSILON); } -#ifndef __CINT__ +#ifndef __CLING__ if (nr >= Int_t(1.0e+5/msize/msize)) { #else if (nr >= Int_t(1.0e+3/msize/msize)) { @@ -4152,7 +4152,7 @@ void astress_pseudo() // Allocate and fill matrix A enum {nrows = 4, ncols = 3}; -#ifndef __CINT__ +#ifndef __CLING__ const Double_t A_data [nrows*ncols] = #else const Double_t A_data [12] = diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx index f2107b7b14c62..c96ff06a9b6e5 100644 --- a/test/stressMathCore.cxx +++ b/test/stressMathCore.cxx @@ -52,7 +52,7 @@ // -#ifndef __CINT__ +#ifndef __CLING__ #include "Math/DistFuncMathCore.h" @@ -154,7 +154,7 @@ int compare( std::string name, double v1, double v2, double scale = 2.0) { return iret; } -#ifndef __CINT__ +#ifndef __CLING__ // trait class for distinguishing the number of parameters for the various functions @@ -1524,14 +1524,14 @@ int testCompositeObj(int ngen) { } -#endif // endif ifndef __CINT__ +#endif // endif ifndef __CLING__ int stressMathCore(double nscale = 1) { int iret = 0; -#ifdef __CINT__ +#ifdef __CLING__ std::cout << "Test must be run in compile mode - use ACLIC to compile!!" << std::endl; diff --git a/test/stressMathMore.cxx b/test/stressMathMore.cxx index 8669f08469e3a..fc12092c47ea9 100644 --- a/test/stressMathMore.cxx +++ b/test/stressMathMore.cxx @@ -43,7 +43,7 @@ using namespace ROOT::Math; -#ifdef __CINT__ +#ifdef __CLING__ #define INF 1.7E308 #else #define INF std::numeric_limits::infinity() @@ -554,7 +554,7 @@ int stressMathMore(double nscale = 1) { int iret = 0; -#ifdef __CINT__ +#ifdef __CLING__ std::cout << "Test must be run in compile mode - please use ACLIC !!" << std::endl; return 0; #endif diff --git a/test/stressProof.cxx b/test/stressProof.cxx index 94d54e2e0bbc5..b86fe90fc6383 100644 --- a/test/stressProof.cxx +++ b/test/stressProof.cxx @@ -214,7 +214,7 @@ int stressProof(const char *url = 0, Bool_t keeplog = kTRUE, Bool_t catlog = kFALSE); //_____________________________batch only_____________________ -#ifndef __CINT__ +#ifndef __CLING__ int main(int argc,const char *argv[]) { diff --git a/test/stressShapes.cxx b/test/stressShapes.cxx index e6265a8b52665..a46c75e5d30b1 100644 --- a/test/stressShapes.cxx +++ b/test/stressShapes.cxx @@ -1,5 +1,5 @@ // Author : Mihaela Gheata 12-01-03 -#ifndef __CINT__ +#ifndef __CLING__ #include #include #include @@ -177,7 +177,7 @@ void stressShapes() // - generate 10000 random directions and propagate from the center // of each volume -> compute total step length to exit current shape -#ifdef __CINT__ +#ifdef __CLING__ gSystem->Load("libGeom"); #endif diff --git a/test/stressSpectrum.cxx b/test/stressSpectrum.cxx index f055fd01aed24..c7616f3119611 100644 --- a/test/stressSpectrum.cxx +++ b/test/stressSpectrum.cxx @@ -269,7 +269,7 @@ void stressSpectrum(Int_t ntimes=100) { printf("****************************************************************************\n"); } -#ifndef __CINT__ +#ifndef __CLING__ int main(int argc, char **argv) { diff --git a/test/tcollex.cxx b/test/tcollex.cxx index e039557d43545..cf7a3afcb7f4a 100644 --- a/test/tcollex.cxx +++ b/test/tcollex.cxx @@ -390,7 +390,7 @@ int tcollex() { return 0; } -#ifndef __CINT__ +#ifndef __CLING__ int main() { return tcollex(); } diff --git a/test/vmatrix.cxx b/test/vmatrix.cxx index 2accd882fd0f6..e40432ee616db 100644 --- a/test/vmatrix.cxx +++ b/test/vmatrix.cxx @@ -28,7 +28,7 @@ ////////////////////////////////////////////////////////////////////////// //_____________________________batch only_____________________ -#ifndef __CINT__ +#ifndef __CLING__ #include #include "snprintf.h" @@ -105,7 +105,7 @@ void stress_matrix(Int_t verbose=0) stress_binary_ebe_op(10,20); stress_transposition(20); stress_special_creation(20); -#ifndef __CINT__ +#ifndef __CLING__ stress_matrix_promises(20); #endif stress_norms(40,20); @@ -255,7 +255,7 @@ void stress_matrix_fill(Int_t rsize,Int_t csize) if (gVerbose) std::cout << "Creating m with Apply function..." << std::endl; TMatrixD m(-1,rsize-2,1,csize); -#ifndef __CINT__ +#ifndef __CLING__ FillMatrix f(m); m.Apply(f); #else @@ -504,7 +504,7 @@ void stress_element_op(Int_t rsize,Int_t csize) if (gVerbose) std::cout << "\nCheck out to see that sin^2(x) + cos^2(x) = 1" << std::endl; { -#ifndef __CINT__ +#ifndef __CLING__ FillMatrix f(m); m.Apply(f); #else @@ -515,7 +515,7 @@ void stress_element_op(Int_t rsize,Int_t csize) } m1 = m; { -#ifndef __CINT__ +#ifndef __CLING__ ApplyFunction s(&TMath::Sin); ApplyFunction c(&TMath::Cos); m.Apply(s); @@ -704,7 +704,7 @@ class MakeHilbert : public TElementPosActionD { MakeHilbert() { } }; -#ifndef __CINT__ +#ifndef __CLING__ class TestUnit : public TElementPosActionD { mutable Int_t fIsUnit; void Operation(Double_t &element) const override @@ -740,7 +740,7 @@ void stress_special_creation(Int_t dim) TMatrixD m1(TMatrixD::kZero,m); ok &= ( !(m == m1) ) ? kTRUE : kFALSE; ok &= ( m != 0 ) ? kTRUE : kFALSE; -#ifndef __CINT__ +#ifndef __CLING__ MakeHilbert mh; m1.Apply(mh); #else @@ -768,7 +768,7 @@ void stress_special_creation(Int_t dim) if (gVerbose) std::cout << "test creating unit matrices" << std::endl; TMatrixD m(dim,dim); -#ifndef __CINT__ +#ifndef __CLING__ { TestUnit test_unit; m.Apply(test_unit); @@ -778,7 +778,7 @@ void stress_special_creation(Int_t dim) ok &= ( !is_indeed_unit(m) ) ? kTRUE : kFALSE; #endif m.UnitMatrix(); -#ifndef __CINT__ +#ifndef __CLING__ { TestUnit test_unit; m.Apply(test_unit); @@ -789,7 +789,7 @@ void stress_special_creation(Int_t dim) #endif m.ResizeTo(dim-1,dim); TMatrixD m2(TMatrixD::kUnit,m); -#ifndef __CINT__ +#ifndef __CLING__ { TestUnit test_unit; m2.Apply(test_unit); @@ -800,7 +800,7 @@ void stress_special_creation(Int_t dim) #endif m.ResizeTo(dim,dim-2); m.UnitMatrix(); -#ifndef __CINT__ +#ifndef __CLING__ { TestUnit test_unit; m.Apply(test_unit); diff --git a/test/vvector.cxx b/test/vvector.cxx index ca8dd44302c91..b83e13db080fe 100644 --- a/test/vvector.cxx +++ b/test/vvector.cxx @@ -20,7 +20,7 @@ ////////////////////////////////////////////////////////////////////////// //_____________________________batch only_____________________ -#ifndef __CINT__ +#ifndef __CLING__ #include "TFile.h" #include @@ -298,7 +298,7 @@ void stress_element_op(Int_t vsize) std::cout << "\nCheck out to see that sin^2(x) + cos^2(x) = 1" << std::endl; for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++) v(i) = 2*TMath::Pi()/v.GetNoElements()*i; -#ifndef __CINT__ +#ifndef __CLING__ SinAction s; v.Apply(s); CosAction c(v.GetNoElements()); @@ -319,7 +319,7 @@ void stress_element_op(Int_t vsize) if (gVerbose) std::cout << "\nVerify constructor with initialization" << std::endl; -#ifndef __CINT__ +#ifndef __CLING__ TVectorD vi(0,4,0.0,1.0,2.0,3.0,4.0,"END"); #else Double_t vval[] = {0.0,1.0,2.0,3.0,4.0}; diff --git a/tmva/pymva/inc/LinkDef.h b/tmva/pymva/inc/LinkDef.h index 83145077ddf53..317c124e8e06f 100644 --- a/tmva/pymva/inc/LinkDef.h +++ b/tmva/pymva/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tmva/rmva/inc/LinkDef.h b/tmva/rmva/inc/LinkDef.h index 28240a2c02c63..78ead2d41b4c2 100644 --- a/tmva/rmva/inc/LinkDef.h +++ b/tmva/rmva/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tmva/sofie/inc/LinkDef.h b/tmva/sofie/inc/LinkDef.h index 0b023bb5dc460..734d04aebd630 100644 --- a/tmva/sofie/inc/LinkDef.h +++ b/tmva/sofie/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tmva/sofie_parsers/inc/LinkDef.h b/tmva/sofie_parsers/inc/LinkDef.h index 167880f89e014..3ceb70e74cd9a 100644 --- a/tmva/sofie_parsers/inc/LinkDef.h +++ b/tmva/sofie_parsers/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tmva/tmva/inc/LinkDef1.h b/tmva/tmva/inc/LinkDef1.h index d2f8ebaeda2e6..42466cad4c227 100644 --- a/tmva/tmva/inc/LinkDef1.h +++ b/tmva/tmva/inc/LinkDef1.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #include "RConfigure.h" diff --git a/tmva/tmva/inc/LinkDef2.h b/tmva/tmva/inc/LinkDef2.h index 3663c209cd24d..e044e90e9ea6d 100644 --- a/tmva/tmva/inc/LinkDef2.h +++ b/tmva/tmva/inc/LinkDef2.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tmva/tmva/inc/LinkDef3.h b/tmva/tmva/inc/LinkDef3.h index ea02596ee4ddd..70905a4a5b554 100644 --- a/tmva/tmva/inc/LinkDef3.h +++ b/tmva/tmva/inc/LinkDef3.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tmva/tmva/inc/LinkDef4.h b/tmva/tmva/inc/LinkDef4.h index 7ac729c9dbb74..4d2cdbf429e1f 100644 --- a/tmva/tmva/inc/LinkDef4.h +++ b/tmva/tmva/inc/LinkDef4.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tmva/tmva/inc/LinkDef5.h b/tmva/tmva/inc/LinkDef5.h index caf041b0b1c1b..aa0ebe7c05975 100644 --- a/tmva/tmva/inc/LinkDef5.h +++ b/tmva/tmva/inc/LinkDef5.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tmva/tmva/inc/LinkDefUtils.h b/tmva/tmva/inc/LinkDefUtils.h index e2b356c789de8..82709731c20f2 100644 --- a/tmva/tmva/inc/LinkDefUtils.h +++ b/tmva/tmva/inc/LinkDefUtils.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #include "RConfigure.h" diff --git a/tmva/tmvagui/inc/LinkDef.h b/tmva/tmvagui/inc/LinkDef.h index d150602d66630..a165b83422847 100644 --- a/tmva/tmvagui/inc/LinkDef.h +++ b/tmva/tmvagui/inc/LinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tree/ntuple/v7/test/CustomStructLinkDef.h b/tree/ntuple/v7/test/CustomStructLinkDef.h index c23cc939e5037..2522c7ca10f7c 100644 --- a/tree/ntuple/v7/test/CustomStructLinkDef.h +++ b/tree/ntuple/v7/test/CustomStructLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link C++ enum CustomEnum; #pragma link C++ enum CustomEnumInt8; diff --git a/tree/ntupleutil/v7/test/CustomStructUtilLinkDef.h b/tree/ntupleutil/v7/test/CustomStructUtilLinkDef.h index 3828eba84c731..907513f236461 100644 --- a/tree/ntupleutil/v7/test/CustomStructUtilLinkDef.h +++ b/tree/ntupleutil/v7/test/CustomStructUtilLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tree/tree/test/ElementStructLinkDef.h b/tree/tree/test/ElementStructLinkDef.h index 4b8a5ce5eeb90..01ed5b6316a75 100644 --- a/tree/tree/test/ElementStructLinkDef.h +++ b/tree/tree/test/ElementStructLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tree/tree/test/SillyStructLinkDef.h b/tree/tree/test/SillyStructLinkDef.h index 0a2cdd2c29a4a..a05d3161571a9 100644 --- a/tree/tree/test/SillyStructLinkDef.h +++ b/tree/tree/test/SillyStructLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tree/webviewer/inc/LinkDef.h b/tree/webviewer/inc/LinkDef.h index 2287f23a1d8a0..a6318f4f5e6b2 100644 --- a/tree/webviewer/inc/LinkDef.h +++ b/tree/webviewer/inc/LinkDef.h @@ -13,7 +13,7 @@ // LinkDef.h - REve objects and services. //============================================================================== -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/tutorials/eve/SplitGLView.C b/tutorials/eve/SplitGLView.C index 018063da0c181..2e7dadaae6b25 100644 --- a/tutorials/eve/SplitGLView.C +++ b/tutorials/eve/SplitGLView.C @@ -1429,7 +1429,7 @@ void SplitGLView::UpdateSummary() } -#ifdef __CINT__ +#ifdef __CLING__ void SplitGLView() { printf("This script is used via ACLiC by the macro \"alice_esd_split.C\"\n"); diff --git a/tutorials/gl/viewer3DLocal.C b/tutorials/gl/viewer3DLocal.C index c91f22c46af79..cca1cea90e7e9 100644 --- a/tutorials/gl/viewer3DLocal.C +++ b/tutorials/gl/viewer3DLocal.C @@ -16,7 +16,7 @@ /// code, this script must also be compiled to work correctly. /// /// ~~~{.cpp} -/// #if defined(__CINT__) && !defined(__MAKECINT__) +/// #if defined(__CLING__) && !defined(__MAKECLING__) /// { /// gSystem->CompileMacro("viewer3DLocal.C"); /// viewer3DLocal(); diff --git a/tutorials/math/mathcoreVectorFloatIO.C b/tutorials/math/mathcoreVectorFloatIO.C index 68e3fa77540d8..b651dc13667e8 100644 --- a/tutorials/math/mathcoreVectorFloatIO.C +++ b/tutorials/math/mathcoreVectorFloatIO.C @@ -35,7 +35,7 @@ // No need to force dictionary generation // You need to run ACLIC with old ROOT version // and uncomment these lines below -// #ifdef __MAKECINT__ +// #ifdef __MAKECLING__ // #pragma link C++ class ROOT::Math::PxPyPzE4D+; // #pragma link C++ class ROOT::Math::LorentzVector >+; // #pragma link C++ typedef ROOT::Math::XYZTVectorF; @@ -101,7 +101,7 @@ void read() { void runIt() { -#if defined(__CINT__) && !defined(__MAKECINT__) +#if defined(__CLING__) && !defined(__MAKECLING__) gSystem->Load("libMathCore"); gSystem->Load("libPhysics"); using namespace ROOT::Math ; @@ -116,7 +116,7 @@ void runIt() { } void mathcoreVectorFloatIO() { -#if defined(__CINT__) && !defined(__MAKECINT__) +#if defined(__CLING__) && !defined(__MAKECLING__) gSystem->Load("libMathCore"); gSystem->Load("libPhysics"); using namespace ROOT::Math ;