[roottest][io] Rename CINT to CLING and MAKECINT to ROOTCLING [part 4]

roottest/root/io/ForeignCArray/LinkDef.h

@@ -1,5 +1,5 @@
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/abstractclass/LinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/abstractclass/abstractInVector.C

@@ -80,7 +80,7 @@ bool abstractInVector() {
    return false;
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class SimuModule+;
 #pragma link C++ class Module+;
 #pragma link C++ class SimuModuleFactory+;

roottest/root/io/alloc/customLoader.C

@@ -1,4 +1,4 @@
 #include "customConstructor.C"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #include "linkdef.h"
 #endif

roottest/root/io/arrayobject/fooLinkdef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/arrayobject/main.C

@@ -130,7 +130,7 @@ int run() {
 
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 int
 main()
 {

roottest/root/io/bigevent/EventLinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 //#ppragma link off all globals;
 //#ppragma link off all classes;

roottest/root/io/bill01/LinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/bill02/LinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/buffer/runownership.C

@@ -3,7 +3,6 @@
 #include "TString.h"
 #include <exception>
 
-#ifndef __CINT__
 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)
 {

roottest/root/io/clones/RtObjLinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/constmembers/LinkDef.h

@@ -1,5 +1,5 @@
 //LinkDef.h
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/constmembers/oldLinkDef.h

@@ -1,5 +1,5 @@
 //LinkDef.h
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/customCollection/execWriteCustomCollection.cxx

@@ -61,7 +61,7 @@ class DataVectorConcrete {
 typedef DataVectorTmplt<Content> DataVector;
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class DataVectorTmplt<Content>+;
 #pragma link C++ class vector<Content>+;
 #pragma link C++ class DataVector+;

roottest/root/io/customStreamer/header.C

@@ -1,11 +1,11 @@
 #include "header.h"
 #include "Rtypes.h"
 
-#ifndef __CINT__
+#ifndef __CLING__
 RootClassVersion(Hard2Stream,2);
 #endif
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class Hard2Stream-;
 #endif
 

roottest/root/io/customStreamer/header.h

@@ -2,9 +2,7 @@
 #include "TClass.h"
 class Hard2Stream {
 private:
-#ifndef __CINT__
    double val;
-#endif
 public:
    Hard2Stream() : val(-1) {};
    Hard2Stream(double v) : val(v) {};

roottest/root/io/datamodelevolution/00/DataModelV1.h

@@ -95,7 +95,7 @@ class Container {
 };
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ options=version(8) class ACache+;
 #pragma link C++ options=version(2) class Container+;
 #pragma link C++ class Unversioned+;

roottest/root/io/datamodelevolution/00/DataModelV2.h

@@ -49,7 +49,7 @@ class Container {
    ACache a;
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ options=version(9) class ACache+;
 #pragma read sourceClass="ACache" targetClass="ACache" source="int x; int y; char c"  version="[8]" target="z" include="TMath.h,math.h" \
    code="{ z = onfile.x*1000 + onfile.y*10; }"

roottest/root/io/datamodelevolution/00/DataModelV3.h

@@ -46,7 +46,7 @@ class Container {
 };
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++  options=version(2) class Axis+;
 #pragma read sourceClass="ACache" targetClass="Axis" source="int x; int y;"  version="[8]" target="z" \
    code="{ z = onfile.x*1000 + onfile.y*10; }"

roottest/root/io/datamodelevolution/01/DataModelV1LinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/datamodelevolution/01/DataModelV2LinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/datamodelevolution/cms-00/DataModelV1LinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/datamodelevolution/cms-00/DataModelV2LinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/datamodelevolution/cms-00/classloader.cxx

@@ -7,7 +7,7 @@
 //        Author     : M.Frank
 //====================================================================
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include "Cintex/Cintex.h"
 #endif
 #include "Reflex/Reflex.h"
@@ -21,7 +21,7 @@
 #include "TDataMember.h"
 
 #include "TCollectionProxyFactory.h"
-#ifndef __CINT__
+#ifndef __CLING__
 #include "Api.h"
 #endif
 
@@ -45,7 +45,7 @@ void patchClass(TClass* cl, TypeH& ) {
 #include <utility>
 #include <vector>
 
-#ifndef __CINT__
+#ifndef __CLING__
 namespace ROOT { namespace Cintex  {
   bool IsSTLinternal(const std::string& nam);
   bool IsSTL(const std::string& nam);

roottest/root/io/datamodelevolution/cms-00/execReadRename1.cxx

@@ -16,7 +16,7 @@ class Flow {
    ClassDefNV(Flow,4);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma read sourceClass="Flow" targetClass="Flow" version="[2]" source="float charged" target="sumCharged" code="{ sumCharged = onfile.charged; }"
 #pragma read sourceClass="Flow" targetClass="Flow" version="[2]" source="float neutral" target="sumNeutral" code="{ sumNeutral = onfile.neutral; }"
 #endif

roottest/root/io/datamodelevolution/cms-00/execReadRename2.cxx

@@ -18,7 +18,7 @@ class Flow {
    ClassDefNV(Flow,3);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma read sourceClass="Flow" targetClass="Flow" version="[2]" source="float charged" target="sumCharged" code="{ sumCharged = onfile.charged; }"
 #endif
 

roottest/root/io/datamodelevolution/common/Demangler.h

@@ -11,7 +11,7 @@
 #include <typeinfo>
 #include <string>
 
-#if !defined(_WIN32) && !defined(__CINT__)
+#if !defined(_WIN32)
 #include <cxxabi.h>
 #endif
 

roottest/root/io/datamodelevolution/misc/MyClass_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;

roottest/root/io/datamodelevolution/misc/OrderClass_v1.h

@@ -23,7 +23,7 @@ class MyClass : public TObject
    ClassDefOverride(MyClass, 1)
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 #endif
 

roottest/root/io/datamodelevolution/misc/OrderClass_v2.h

@@ -21,7 +21,7 @@ class MyClass : public TObject
    ClassDefOverride(MyClass, 2)
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 
 #pragma read sourceClass="MyClass" version="[1]" source="int ver" \

roottest/root/io/datamodelevolution/misc/arrayRulesLinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 #pragma read sourceClass="MyClass" targetClass="MyClass" source="" target="fCaches" code="{ newObj->fCaches[0] = 1; }"
 #pragma read sourceClass="MyClass" targetClass="MyClass" source="float fOldCaches[3]" target="fCaches"  code="{ newObj->fCaches[0] = onfile.fOldCaches[0]; }"

roottest/root/io/datamodelevolution/stl/libcond.patch

@@ -11,7 +11,7 @@
   #include "Riostream.h"
   #include <map>
   #include "HepGeom__Transform3D.h"
-  #ifdef __MAKECINT__
+  #ifdef __ROOTCLING__
   #pragma link C++ class pair<string,HepGeom::Transform3D >+;
 + #pragma link C++ class Eigen+;
 + #pragma link C++ class pair<string,Eigen>+;

roottest/root/io/datamodelevolution/stl/libcond/DetCondKeyTrans.h

@@ -13,7 +13,7 @@ class Eigen {};
 #include "Riostream.h"
 #include <map>
 #include "HepGeom__Transform3D.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class pair<string,HepGeom::Transform3D >+;
 #pragma link C++ class Eigen+;
 #pragma link C++ class pair<string,Eigen>+;

roottest/root/io/datamodelevolution/stl/libcond/libcondLinkDef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class DetCondKeyTrans+;
 #pragma link C++ class HepGeom::Transform3D+;

roottest/root/io/datamodelevolution/stl/readFile.C

@@ -37,7 +37,7 @@ public:
 typedef Track Values;
 #endif
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma read sourceClass="Values" targetClass="Track";
 #pragma link C++ class vector<Track>+;
 #pragma read sourceClass="Holder" targetClass="listHolder";

roottest/root/io/datamodelevolution/stl/writeFile.C

@@ -71,7 +71,7 @@ void Print(const std::map<key,value> &fMap) {
    }
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma read sourceClass="Holder" targetClass="listHolder";
 #endif
 

roottest/root/io/double32/other.C

@@ -1,6 +1,6 @@
 #include "runtemplate32.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyVector<double>+;
 #endif
 

roottest/root/io/double32/runtemplate32.C

@@ -1,7 +1,7 @@
 #include "runtemplate32.h"
 #include "longExample.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class WithDouble+;
 #pragma link C++ class MyVector<Double32_t>+;
 #pragma link C++ class MyVector<float>+;

roottest/root/io/emulated/abstract.h

@@ -13,7 +13,7 @@ class Abstract {
    virtual void Action() = 0;
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Abstract+;
 #endif
 

roottest/root/io/emulated/classes.h

@@ -143,7 +143,7 @@ class Holder {
    ClassDef(Holder,2);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<TopLevel*>;
 #endif
 

roottest/root/io/emulated/marker.h

@@ -25,7 +25,7 @@ class Marker
    ClassDef(Marker,2);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Marker+;
 #endif
 

roottest/root/io/emulated/write.C

@@ -1,4 +1,4 @@
-#if defined(__CLING__) && !defined(__MAKECINT__) && !defined(ClingWorkAroundMissingSmartInclude)
+#if defined(__CLING__) && !defined(__ROOTCLING__) && !defined(ClingWorkAroundMissingSmartInclude)
 #include "classes.h+"
 #else
 #include "classes.h"

roottest/root/io/evolution/ClassConvNew.cxx

@@ -1,6 +1,6 @@
 #define VERSION 2
 #include "ClassConv.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ namespace MyLib;
 #pragma link C++ class MyLib::Inside+;
 #pragma link C++ class TopLevel+;

roottest/root/io/evolution/ClassConvOld.cxx

@@ -1,6 +1,6 @@
 #define VERSION 1
 #include "ClassConv.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Inside+;
 #pragma link C++ class TopLevel+;
 #pragma link C++ class Typedefed+;

roottest/root/io/evolution/ClassConvOther.cxx

@@ -1,6 +1,6 @@
 #define VERSION 3
 #include "ClassConv.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ namespace OtherLib;
 #pragma link C++ class OtherLib::Inside+;
 #pragma link C++ class TopLevel+;

roottest/root/io/evolution/MyClass.C

@@ -1,5 +1,5 @@
 #define VERSION 2
 #include "MyClass.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 #endif

roottest/root/io/evolution/array/MyClass.cxx

@@ -84,6 +84,6 @@ void MyClass::SetArray(Int_t* array){
 }
 #endif
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 #endif