diff --git a/tree/inc/TTree.h b/tree/inc/TTree.h index 4f4e93fe709c87b8770a82f345ef614139e76997..f346537a90afc80b20514ed2bad1916e81dcb4f0 100644 --- a/tree/inc/TTree.h +++ b/tree/inc/TTree.h @@ -1,4 +1,4 @@ -// @(#)root/tree:$Name: $:$Id: TTree.h,v 1.15 2000/11/21 20:48:58 brun Exp $ +// @(#)root/tree:$Name: $:$Id: TTree.h,v 1.16 2000/11/23 10:21:25 brun Exp $ // Author: Rene Brun 12/01/96 /************************************************************************* @@ -108,7 +108,6 @@ protected: TEventList *fEventList; //! Pointer to event selection list (if one) TArrayD fIndexValues; // Sorted index values TArrayI fIndex; // Index of sorted values - TList *fStreamerInfoList; //! list of StreamerInfo for all TBranchObjects TVirtualTreePlayer *fPlayer; //! Pointer to current Tree player protected: @@ -153,7 +152,6 @@ public: virtual Int_t GetChainEntryNumber(Int_t entry) {return entry;} virtual Int_t GetChainOffset() const { return fChainOffset; } TFile *GetCurrentFile(); - TList *GetStreamerInfoList() {return fStreamerInfoList;} TDirectory *GetDirectory() {return fDirectory;} virtual Stat_t GetEntries() {return fEntries;} virtual Int_t GetEstimate() const { return fEstimate; } diff --git a/tree/src/TBranchClones.cxx b/tree/src/TBranchClones.cxx index 64fd51746f6d309482da5fefae262389ea81941a..70d1d51b68c19fe66f023b19657856f6ee524342 100644 --- a/tree/src/TBranchClones.cxx +++ b/tree/src/TBranchClones.cxx @@ -1,4 +1,4 @@ -// @(#)root/tree:$Name: $:$Id: TBranchClones.cxx,v 1.2 2000/09/06 07:17:49 brun Exp $ +// @(#)root/tree:$Name: $:$Id: TBranchClones.cxx,v 1.3 2000/09/29 07:51:12 brun Exp $ // Author: Rene Brun 11/02/96 /************************************************************************* @@ -82,11 +82,9 @@ TBranchClones::TBranchClones(const char *name, void *pointer, Int_t basketsize, fBranchCount->SetBit(kIsClone); TLeaf *leafcount = (TLeaf*)fBranchCount->GetListOfLeaves()->UncheckedAt(0); -//*-*- Add StreamerInfo to Tree list fTree = gTree; fDirectory = fTree->GetDirectory(); fFileName = ""; - cl->FillStreamerInfoList(fTree->GetStreamerInfoList()); //*-*- Create the first basket TBasket *basket = new TBasket(branchcount,fTree->GetName(),this); diff --git a/tree/src/TBranchObject.cxx b/tree/src/TBranchObject.cxx index 448cde3a3566133bfa64b0482eb9f2be0ea375e4..828c7fdaea29a3dcede45abff18f3ec20c438709 100644 --- a/tree/src/TBranchObject.cxx +++ b/tree/src/TBranchObject.cxx @@ -1,4 +1,4 @@ -// @(#)root/tree:$Name: $:$Id: TBranchObject.cxx,v 1.2 2000/09/05 09:21:24 brun Exp $ +// @(#)root/tree:$Name: $:$Id: TBranchObject.cxx,v 1.3 2000/09/29 07:51:12 brun Exp $ // Author: Rene Brun 11/02/96 /************************************************************************* @@ -91,11 +91,9 @@ TBranchObject::TBranchObject(const char *name, const char *classname, void *addo // It is foreseen to not set this bit in a future version. SetAutoDelete(kTRUE); -//*-*- Add StreamerInfo to Tree list fTree = gTree; fDirectory = fTree->GetDirectory(); fFileName = ""; - cl->FillStreamerInfoList(fTree->GetStreamerInfoList()); //*-*- Create the first basket if (splitlevel) return; diff --git a/tree/src/TTree.cxx b/tree/src/TTree.cxx index 385f4bb1b04e181355360198606fcc6a03acab16..698d5a9b0577161e6cac5fba70dfa95543218d06 100644 --- a/tree/src/TTree.cxx +++ b/tree/src/TTree.cxx @@ -1,4 +1,4 @@ -// @(#)root/tree:$Name: $:$Id: TTree.cxx,v 1.27 2000/11/22 20:57:27 brun Exp $ +// @(#)root/tree:$Name: $:$Id: TTree.cxx,v 1.28 2000/11/23 10:21:25 brun Exp $ // Author: Rene Brun 12/01/96 /************************************************************************* @@ -271,7 +271,6 @@ TTree::TTree(): TNamed() fPacketSize = 100; fTimerInterval = 0; fPlayer = 0; - fStreamerInfoList = new TList(); } //______________________________________________________________________________ @@ -302,7 +301,6 @@ TTree::TTree(const char *name,const char *title, Int_t maxvirtualsize) fPacketSize = 100; fTimerInterval = 0; fPlayer = 0; - fStreamerInfoList = new TList(); SetFillColor(gStyle->GetHistFillColor()); SetFillStyle(gStyle->GetHistFillStyle()); @@ -329,8 +327,6 @@ TTree::~TTree() fBranches.Delete(); fDirectory = 0; delete fPlayer; - fStreamerInfoList->Delete(); - delete fStreamerInfoList; } //______________________________________________________________________________ @@ -2097,7 +2093,11 @@ void TTree::Streamer(TBuffer &b) gDirectory->Append(this); if (R__v > 1) fIndexValues.Streamer(b); if (R__v > 2) fIndex.Streamer(b); - if (R__v > 3) fStreamerInfoList->Streamer(b); + if (R__v > 3) { + TList OldInfoList; + OldInfoList.Streamer(b); + OldInfoList.Delete(); + } b.CheckByteCount(R__s, R__c, TTree::IsA()); //====end of old versions