[tree] implement missing classdefs

Author: ferdymercury

roottest/root/io/namespacedict/Header.h

@@ -15,13 +15,9 @@ namespace A {
 #ifdef WIN32
       ClassDef(Class2,1) //
 #else
-      ClassDefT(A::Class2<T>,1) //
+      ClassDef(A::Class2<T>,1) //
 #endif
    };
-   
-#ifndef __MAKECINT__
-  ClassDefT2(Class2,T)
-#endif
 }
 
 namespace B {

roottest/root/io/newClassDef/current/template.C

@@ -1,8 +1,6 @@
 #include "template.h"
 #include "TBufferFile.h"
 
-//ClassImpT(MyTemplate,const int)
-
 #ifdef _ClassInit_
 // Old Style
 #define _ClassImpTS_(name,Tmpl) \
@@ -27,9 +25,6 @@
 
 ClassImpTS(MyTemplate,const double*)
 
-ClassImpT(MyTemplate,T)
-ClassImp2T(MyPairTemplate,T,T2)
-
 const double dvalue = 33.3;
 
 static MyTemplate<int> dummy(1);

roottest/root/io/rootcint/cltestClass.cxx

@@ -11,7 +11,6 @@
 
 
 ClassImp(TestClass)
-ClassImpT(TestClass::IE_t, T)
 
 
 //________________________________________________________________________

roottest/root/io/rootcint/cltestClass.h

@@ -23,7 +23,7 @@ class TestClass : public TObject {
       TIE_t() : fIndex(0), fVal(0) {} 
       TIE_t(UInt_t i, T v) : fIndex(i),fVal(v) {}
       virtual ~TIE_t() {}
-      ClassDefT(TIE_t,1) // Generic parameter given by an index (in common block)
+      ClassDef(TIE_t,1) // Generic parameter given by an index (in common block)
   };
 
    template<typename T = Int_t>

roottest/root/meta/rootcling/selectTemplateInvalidArg.h

@@ -6,9 +6,6 @@ class RtObj2 : public T
   public:
     RtObj2() {}
     RtObj2( const T & val ) : T(val) {}
-    ClassDefT(RtObj2,1)
+    ClassDef(RtObj2,1)
  } ;
 
-ClassDefT2(RtObj2,T)
-
-ClassImpT(RtObj2,T)

tree/treeplayer/inc/TTreeReaderArray.h

@@ -52,8 +52,7 @@ class TTreeReaderArrayBase : public TTreeReaderValueBase {
 
    std::unique_ptr<TVirtualCollectionReader> fImpl; // Common interface to collections
 
-   // FIXME: re-introduce once we have ClassDefInline!
-   // ClassDefOverride(TTreeReaderArrayBase, 0);//Accessor to member of an object stored in a collection
+   ClassDefInlineOverride(TTreeReaderArrayBase, 0);//Accessor to member of an object stored in a collection
 };
 
 class R__CLING_PTRCHECK(off) TTreeReaderUntypedArray final : public TTreeReaderArrayBase {
@@ -241,8 +240,7 @@ class R__CLING_PTRCHECK(off) TTreeReaderArray final : public ROOT::Internal::TTr
 #define R__TTreeReaderArray_TypeString(T) #T
    const char *GetDerivedTypeName() const override { return R__TTreeReaderArray_TypeString(T); }
 #undef R__TTreeReaderArray_TypeString
-   // FIXME: re-introduce once we have ClassDefTInline!
-   // ClassDefT(TTreeReaderArray, 0);//Accessor to member of an object stored in a collection
+   ClassDefInline(TTreeReaderArray, 0);//Accessor to member of an object stored in a collection
 };
 
 namespace cling {

tree/treeplayer/inc/TTreeReaderValue.h

@@ -150,8 +150,7 @@ class TTreeReaderValueBase {
     */
    bool fOpaqueRead{false};
 
-   // FIXME: re-introduce once we have ClassDefInline!
-   // ClassDefOverride(TTreeReaderValueBase, 0);//Base class for accessors to data via TTreeReader
+   ClassDefInlineOverride(TTreeReaderValueBase, 0);//Base class for accessors to data via TTreeReader
 
    friend class ::TTreeReader;
 };
@@ -238,16 +237,15 @@ class R__CLING_PTRCHECK(off) TTreeReaderValue final : public ROOT::Internal::TTr
    T &operator*() { return *Get(); }
 
 protected:
-   // FIXME: use IsA() instead once we have ClassDefTInline
+   // FIXME: use IsA() instead
    /// Get the template argument as a string.
    const char *GetDerivedTypeName() const override
    {
       static const std::string sElementTypeName = GetElementTypeName(typeid(T));
       return sElementTypeName.data();
    }
 
-   // FIXME: re-introduce once we have ClassDefTInline!
-   // ClassDefT(TTreeReaderValue, 0);//Accessor to data via TTreeReader
+   ClassDefInlineOverride(TTreeReaderValue, 0);//Accessor to data via TTreeReader
 };
 
 namespace cling {