From bc2262d837398ee714c8b407817274de1b0d9d1f Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 1 Mar 2005 04:47:15 +0000 Subject: [PATCH] Correcting sources of warnings --- CONTAINERS/AliArrayBranch.cxx | 2 +- CONTAINERS/AliArrayBranch.h | 6 ++++-- CONTAINERS/TArrayOfArray.h | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CONTAINERS/AliArrayBranch.cxx b/CONTAINERS/AliArrayBranch.cxx index d0f270cbe08..1e238c3852d 100644 --- a/CONTAINERS/AliArrayBranch.cxx +++ b/CONTAINERS/AliArrayBranch.cxx @@ -431,7 +431,7 @@ Int_t AliArrayBranch::Fill() } //______________________________________________________________________________ -Int_t AliArrayBranch::GetEntry(Int_t entry, Int_t getall) +Int_t AliArrayBranch::GetEntry(Long64_t entry, Int_t getall) { //*-*-*-*-*Read all branches of a BranchClones and return total number of bytes //*-* ==================================================================== diff --git a/CONTAINERS/AliArrayBranch.h b/CONTAINERS/AliArrayBranch.h index 2869c0218fc..eb5214dfcf3 100644 --- a/CONTAINERS/AliArrayBranch.h +++ b/CONTAINERS/AliArrayBranch.h @@ -16,6 +16,7 @@ #include "TBranch.h" #include "TTree.h" #include "TBranchObject.h" +class TClonesArray; class AliObjectArray; class AliArraySubBranch : public TBranch { @@ -23,7 +24,8 @@ public: AliArraySubBranch(){;} AliArraySubBranch(const char* name, void* address, const char* leaflist, Int_t basketsize = 32000, Int_t compress = -1):TBranch(name, address, leaflist, basketsize, compress){;} - virtual Int_t GetEntryExport(Int_t entry, Int_t getall, AliObjectArray* list, Int_t n); + virtual Int_t GetEntryExport(Long64_t entry, Int_t getall, TClonesArray* list, Int_t n) { return TBranch::GetEntryExport(entry, getall, list, n); } + virtual Int_t GetEntryExport(Int_t entry, Int_t getall, AliObjectArray* list, Int_t n); virtual void ReadBasketExport(TBuffer &b, TLeaf *leaf, AliObjectArray *list, Int_t n); ClassDef(AliArraySubBranch,1) //Branch in case of an array of clone objects }; @@ -47,7 +49,7 @@ public: virtual void Browse(TBrowser *b); virtual Int_t Fill(); - virtual Int_t GetEntry(Int_t entry=0, Int_t getall = 0); + virtual Int_t GetEntry(Long64_t entry=0, Int_t getall = 0); virtual Int_t GetN() {return fN;} AliObjectArray *GetList() {return fList;} Bool_t IsFolder() {return kTRUE;} diff --git a/CONTAINERS/TArrayOfArray.h b/CONTAINERS/TArrayOfArray.h index 36a664b3b84..c999926ef0f 100644 --- a/CONTAINERS/TArrayOfArray.h +++ b/CONTAINERS/TArrayOfArray.h @@ -11,6 +11,7 @@ class TArrayOfArray: public TObject { public: virtual void * At(UInt_t index0, UInt_t index1)=0; //get pointer to the object + virtual void Dump() const {TObject::Dump();} virtual void Dump(UInt_t index0, UInt_t index1)=0; virtual Int_t Resize(Int_t index, UInt_t newsize)=0; //expand array with index index to newsize @@ -34,6 +35,7 @@ public: // virtual void * At(UInt_t index0, UInt_t index1); //get pointer to the object + virtual void Dump() const {TArrayOfArray::Dump();} virtual void Dump(UInt_t index0, UInt_t index1); virtual Int_t Resize(Int_t index, UInt_t newsize); //expand array with index index to newsize -- 2.39.3