From 6c4904c2e7b88b314ced3331c2849d658c77afa7 Mon Sep 17 00:00:00 2001 From: hristov Date: Thu, 11 Dec 2003 23:53:02 +0000 Subject: [PATCH] Removing warnings (icc) --- STEER/AliDetector.cxx | 2 +- STEER/AliDetector.h | 2 +- STEER/AliDigitizer.cxx | 2 +- STEER/AliDigitizer.h | 2 +- STEER/AliDisplay.cxx | 2 +- STEER/AliDisplay.h | 2 +- STEER/AliFieldMap.cxx | 2 +- STEER/AliFieldMap.h | 2 +- STEER/AliGenerator.cxx | 2 +- STEER/AliGenerator.h | 2 +- STEER/AliHeader.cxx | 2 +- STEER/AliHeader.h | 2 +- STEER/AliLego.cxx | 2 +- STEER/AliLego.h | 2 +- STEER/AliMC.cxx | 2 +- STEER/AliMC.h | 2 +- STEER/AliMCQA.cxx | 2 +- STEER/AliMCQA.h | 2 +- STEER/AliMagFCM.cxx | 2 +- STEER/AliMagFCM.h | 2 +- STEER/AliMagFMaps.cxx | 2 +- STEER/AliMagFMaps.h | 2 +- STEER/AliMemoryWatcher.cxx | 5 +++-- STEER/AliMemoryWatcher.h | 2 +- STEER/AliModule.cxx | 12 +----------- STEER/AliModule.h | 3 +-- STEER/AliPoints.cxx | 10 +++++----- STEER/AliPoints.h | 2 +- STEER/AliRecPoint.cxx | 30 +++++++++++++++--------------- STEER/AliRecPoint.h | 2 +- STEER/AliRun.cxx | 2 +- STEER/AliRun.h | 2 +- STEER/AliRunDigitizer.cxx | 2 +- STEER/AliRunDigitizer.h | 2 +- STEER/AliStack.cxx | 2 +- STEER/AliStack.h | 2 +- STEER/AliTrackMap.cxx | 2 +- STEER/AliTrackMap.h | 2 +- 38 files changed, 58 insertions(+), 68 deletions(-) diff --git a/STEER/AliDetector.cxx b/STEER/AliDetector.cxx index 7e90fda061f..3731b6196fa 100644 --- a/STEER/AliDetector.cxx +++ b/STEER/AliDetector.cxx @@ -217,7 +217,7 @@ void AliDetector::Browse(TBrowser *b) } //_______________________________________________________________________ -void AliDetector::Copy(AliDetector &) const +void AliDetector::Copy(TObject &) const { // // Copy *this onto det -- not implemented diff --git a/STEER/AliDetector.h b/STEER/AliDetector.h index ad2f178a039..38100bd5251 100644 --- a/STEER/AliDetector.h +++ b/STEER/AliDetector.h @@ -23,7 +23,7 @@ public: virtual ~AliDetector(); // Inline functions - void Copy(AliDetector &det) const; + void Copy(TObject &det) const; virtual int GetNdigits() const {return fNdigits;} virtual int GetNhits() const {return fNhits;} TClonesArray *Digits() const {return fDigits;} diff --git a/STEER/AliDigitizer.cxx b/STEER/AliDigitizer.cxx index fe002825194..1510d4fa7e8 100644 --- a/STEER/AliDigitizer.cxx +++ b/STEER/AliDigitizer.cxx @@ -54,7 +54,7 @@ AliDigitizer::AliDigitizer(const AliDigitizer &dig): } //_______________________________________________________________________ -void AliDigitizer::Copy(AliDigitizer &) const +void AliDigitizer::Copy(TObject &) const { Fatal("Copy","Not yet implemented\n"); } diff --git a/STEER/AliDigitizer.h b/STEER/AliDigitizer.h index b6199489fae..c4a534c1423 100644 --- a/STEER/AliDigitizer.h +++ b/STEER/AliDigitizer.h @@ -38,7 +38,7 @@ class AliDigitizer: public TTask { protected: Int_t GetNInputStreams() const; - void Copy(AliDigitizer &dig) const; + void Copy(TObject &dig) const; AliRunDigitizer *fManager; // Pointer to the Digitizer manager diff --git a/STEER/AliDisplay.cxx b/STEER/AliDisplay.cxx index 47fd86bafc9..8bb6bf67a1d 100644 --- a/STEER/AliDisplay.cxx +++ b/STEER/AliDisplay.cxx @@ -342,7 +342,7 @@ void AliDisplay::Clear(Option_t *) } //_____________________________________________________________________________ -void AliDisplay::Copy(AliDisplay &) const +void AliDisplay::Copy(TObject &) const { // // Copy *this onto disp -- not implemented diff --git a/STEER/AliDisplay.h b/STEER/AliDisplay.h index c9205c5ef51..575d8996c09 100644 --- a/STEER/AliDisplay.h +++ b/STEER/AliDisplay.h @@ -36,7 +36,7 @@ public: TSlider *CutSlider() {return fCutSlider;} virtual void ShowTrack(Int_t trackNumber); // *MENU* virtual void HideTrack(Int_t trackNumber) const; // *MENU* - void Copy(AliDisplay &disp) const; + void Copy(TObject &disp) const; virtual void DisableDetector(const char *name); // *MENU* virtual void DisplayButtons(); virtual Int_t DistancetoPrimitive(Int_t px, Int_t py); diff --git a/STEER/AliFieldMap.cxx b/STEER/AliFieldMap.cxx index c2ae56d161e..aad8fbc04b0 100644 --- a/STEER/AliFieldMap.cxx +++ b/STEER/AliFieldMap.cxx @@ -263,7 +263,7 @@ void AliFieldMap::Field(Float_t *x, Float_t *b) } //_______________________________________________________________________ -void AliFieldMap::Copy(AliFieldMap & /* magf */) const +void AliFieldMap::Copy(TObject & /* magf */) const { // // Copy *this onto magf -- Not implemented diff --git a/STEER/AliFieldMap.h b/STEER/AliFieldMap.h index 832a4ec14a5..7ebf65d8d06 100644 --- a/STEER/AliFieldMap.h +++ b/STEER/AliFieldMap.h @@ -20,7 +20,7 @@ public: AliFieldMap(const char *name, const char *title); AliFieldMap(const AliFieldMap &mag); virtual ~AliFieldMap(); - void Copy(AliFieldMap &map) const; + void Copy(TObject &map) const; virtual AliFieldMap & operator=(const AliFieldMap &map); virtual void Field(Float_t *x, Float_t *b); diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx index 8a3887e5e41..507a2849cd4 100644 --- a/STEER/AliGenerator.cxx +++ b/STEER/AliGenerator.cxx @@ -209,7 +209,7 @@ AliGenerator & AliGenerator::operator=(const AliGenerator &gen) } //_______________________________________________________________________ -void AliGenerator::Copy(AliGenerator &/* gen */) const +void AliGenerator::Copy(TObject &/* gen */) const { // // Copy *this onto gen diff --git a/STEER/AliGenerator.h b/STEER/AliGenerator.h index 63a9e90fc25..9d36f9f71a4 100644 --- a/STEER/AliGenerator.h +++ b/STEER/AliGenerator.h @@ -38,7 +38,7 @@ class AliGenerator : public TNamed, public AliRndm AliGenerator(const AliGenerator &gen); virtual ~AliGenerator(); virtual void Init(); - void Copy(AliGenerator &gen) const; + void Copy(TObject &gen) const; virtual void SetOrigin(Float_t ox, Float_t oy, Float_t oz); virtual void SetOrigin(const TLorentzVector &o); virtual void SetSigma(Float_t sx, Float_t sy, Float_t sz); diff --git a/STEER/AliHeader.cxx b/STEER/AliHeader.cxx index a78907c0414..25f867190d8 100644 --- a/STEER/AliHeader.cxx +++ b/STEER/AliHeader.cxx @@ -168,7 +168,7 @@ AliGenEventHeader* AliHeader::GenEventHeader() const } //_______________________________________________________________________ -void AliHeader::Copy(AliHeader&) const +void AliHeader::Copy(TObject&) const { Fatal("Copy","Not implemented\n"); } diff --git a/STEER/AliHeader.h b/STEER/AliHeader.h index 62d1a47347c..114838eced7 100644 --- a/STEER/AliHeader.h +++ b/STEER/AliHeader.h @@ -53,7 +53,7 @@ public: protected: - void Copy(AliHeader& head) const; + void Copy(TObject& head) const; Int_t fRun; //Run number Int_t fNvertex; //Number of vertices diff --git a/STEER/AliLego.cxx b/STEER/AliLego.cxx index 5282b61ceff..4a4bff9bf6a 100644 --- a/STEER/AliLego.cxx +++ b/STEER/AliLego.cxx @@ -259,7 +259,7 @@ void AliLego::FinishRun() } //_______________________________________________________________________ -void AliLego::Copy(AliLego&) const +void AliLego::Copy(TObject&) const { // // Copy *this onto lego -- not implemented diff --git a/STEER/AliLego.h b/STEER/AliLego.h index c3cda8997b8..13cc4850e70 100644 --- a/STEER/AliLego.h +++ b/STEER/AliLego.h @@ -36,7 +36,7 @@ public: {lego.Copy(*this);return(*this);} private: - void Copy(AliLego &lego) const; + void Copy(TObject &lego) const; void DumpVolumes(); private: diff --git a/STEER/AliMC.cxx b/STEER/AliMC.cxx index 0c5804d4947..e351c6d414b 100644 --- a/STEER/AliMC.cxx +++ b/STEER/AliMC.cxx @@ -123,7 +123,7 @@ AliMC::~AliMC() } //_______________________________________________________________________ -void AliMC::Copy(AliMC &) const +void AliMC::Copy(TObject &) const { //dummy Copy function Fatal("Copy","Not implemented!\n"); diff --git a/STEER/AliMC.h b/STEER/AliMC.h index 5d7296136d7..00efdec13e5 100644 --- a/STEER/AliMC.h +++ b/STEER/AliMC.h @@ -100,7 +100,7 @@ public: private: - void Copy (AliMC &mc) const; + void Copy (TObject &mc) const; AliGenerator *fGenerator; // Generator used in the MC TArrayF fEventEnergy; //! Energy deposit for current event TArrayF fSummEnergy; //! Energy per event in each volume diff --git a/STEER/AliMCQA.cxx b/STEER/AliMCQA.cxx index 68789c7823c..735e43d5316 100644 --- a/STEER/AliMCQA.cxx +++ b/STEER/AliMCQA.cxx @@ -171,7 +171,7 @@ AliMCQA::AliMCQA(Int_t ndets): } //_______________________________________________________________________ -void AliMCQA::Copy(AliMCQA &) const +void AliMCQA::Copy(TObject &) const { Fatal("Copy ctor","Not implemented!\n"); } diff --git a/STEER/AliMCQA.h b/STEER/AliMCQA.h index b57d309387f..779891cb666 100644 --- a/STEER/AliMCQA.h +++ b/STEER/AliMCQA.h @@ -52,7 +52,7 @@ protected: private: void DrawPaveLabel(TPaveLabel *&pv); Int_t GetHBin(const char* hname); - void Copy(AliMCQA& qa) const; + void Copy(TObject& qa) const; ClassDef(AliMCQA,1) //Quality Assurance class for the MC }; diff --git a/STEER/AliMagFCM.cxx b/STEER/AliMagFCM.cxx index fdd2f8218aa..e9b027d0196 100644 --- a/STEER/AliMagFCM.cxx +++ b/STEER/AliMagFCM.cxx @@ -251,7 +251,7 @@ void AliMagFCM::ReadField() } //_______________________________________________________________________ -void AliMagFCM::Copy(AliMagFCM & /* magf */) const +void AliMagFCM::Copy(TObject & /* magf */) const { // // Copy *this onto magf -- Not implemented diff --git a/STEER/AliMagFCM.h b/STEER/AliMagFCM.h index 89e0a430365..6985e4d8faf 100644 --- a/STEER/AliMagFCM.h +++ b/STEER/AliMagFCM.h @@ -23,7 +23,7 @@ public: virtual void SetSolenoidField(Float_t field = 2.) {fSolenoid = field;} virtual Float_t SolenoidField() const {return fSolenoid;} - void Copy(AliMagFCM &magf) const; + void Copy(TObject &magf) const; virtual AliMagFCM & operator=(const AliMagFCM &magf) {magf.Copy(*this); return *this;} diff --git a/STEER/AliMagFMaps.cxx b/STEER/AliMagFMaps.cxx index 7ae12bbbe48..68901481aad 100644 --- a/STEER/AliMagFMaps.cxx +++ b/STEER/AliMagFMaps.cxx @@ -234,7 +234,7 @@ void AliMagFMaps::Field(Float_t *x, Float_t *b) } //_______________________________________________________________________ -void AliMagFMaps::Copy(AliMagFMaps & /* magf */) const +void AliMagFMaps::Copy(TObject & /* magf */) const { // // Copy *this onto magf -- Not implemented diff --git a/STEER/AliMagFMaps.h b/STEER/AliMagFMaps.h index 362d0ed8055..5d36823e117 100644 --- a/STEER/AliMagFMaps.h +++ b/STEER/AliMagFMaps.h @@ -36,7 +36,7 @@ public: {magf.Copy(*this); return *this;} protected: - void Copy(AliMagFMaps &magf) const; + void Copy(TObject &magf) const; AliFieldMap* fFieldMap[3]; // Field maps Float_t fSolenoid; // Solenoid field setting diff --git a/STEER/AliMemoryWatcher.cxx b/STEER/AliMemoryWatcher.cxx index 0ffdad0c610..40f4528ed67 100644 --- a/STEER/AliMemoryWatcher.cxx +++ b/STEER/AliMemoryWatcher.cxx @@ -197,11 +197,12 @@ AliMemoryWatcher::Frame(void) const return h; } //_____________________________________________________________________________ -void -AliMemoryWatcher::Write(void) +Int_t +AliMemoryWatcher::Write(const char *, Int_t, Int_t) { // Stores the graphs in a file if ( GraphVSIZE() ) GraphVSIZE()->Write("VSIZE",TObject::kOverwrite); if ( GraphRSSIZE() ) GraphRSSIZE() ->Write("RSSIZE",TObject::kOverwrite); if ( GraphTIME() ) GraphTIME()->Write("TIME",TObject::kOverwrite); + return 0; } diff --git a/STEER/AliMemoryWatcher.h b/STEER/AliMemoryWatcher.h index 2c31cdaf2f2..090ef0d8193 100644 --- a/STEER/AliMemoryWatcher.h +++ b/STEER/AliMemoryWatcher.h @@ -57,7 +57,7 @@ public: TGraph* GraphRSSIZE(void); TGraph* GraphTIME(void); TH2* Frame(void) const ; - void Write(void); + Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0); AliMemoryWatcher & operator = (const AliMemoryWatcher &) { return *this; } private: Int_t fPID; // PID of the process to watch diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx index edd106e62bb..43b99bcb36e 100644 --- a/STEER/AliModule.cxx +++ b/STEER/AliModule.cxx @@ -182,7 +182,7 @@ AliModule::~AliModule() } //_______________________________________________________________________ -void AliModule::Copy(AliModule & /* mod */) const +void AliModule::Copy(TObject & /* mod */) const { // // Copy *this onto mod, not implemented for AliModule @@ -207,16 +207,6 @@ void AliModule::Disable() } } -//_______________________________________________________________________ -Int_t AliModule::DistancetoPrimitive(Int_t, Int_t) const -{ - // - // Return distance from mouse pointer to object - // Dummy routine for the moment - // - return 9999; -} - //_______________________________________________________________________ void AliModule::Enable() { diff --git a/STEER/AliModule.h b/STEER/AliModule.h index 35db6d6f65e..b4ee8d598a5 100644 --- a/STEER/AliModule.h +++ b/STEER/AliModule.h @@ -93,7 +93,6 @@ public: virtual void CreateGeometry() {} virtual void CreateMaterials() {} virtual void Disable(); - virtual Int_t DistancetoPrimitive(Int_t px, Int_t py) const; virtual void Enable(); virtual void PreTrack(){} virtual void PostTrack(){} @@ -145,7 +144,7 @@ public: {mod.Copy(*this); return (*this);} protected: - void Copy(AliModule &mod) const; + void Copy(TObject &mod) const; // Data members diff --git a/STEER/AliPoints.cxx b/STEER/AliPoints.cxx index 358986f8c79..20cfeaacdbb 100644 --- a/STEER/AliPoints.cxx +++ b/STEER/AliPoints.cxx @@ -82,17 +82,17 @@ AliPoints::~AliPoints() } //_______________________________________________________________________ -void AliPoints::Copy(AliPoints &pts) const +void AliPoints::Copy(TObject &pts) const { // // Copy *this onto pts // if(this != &pts) { ((TPolyMarker3D*)this)->Copy(dynamic_cast(pts)); - pts.fGLList = fGLList; - pts.fLastPoint = fLastPoint; - pts.fDetector = fDetector; - pts.fIndex = fIndex; + (dynamic_cast(pts)).fGLList = fGLList; + (dynamic_cast(pts)).fLastPoint = fLastPoint; + (dynamic_cast(pts)).fDetector = fDetector; + (dynamic_cast(pts)).fIndex = fIndex; } } diff --git a/STEER/AliPoints.h b/STEER/AliPoints.h index 5b1dc4d4b14..5dbd214a156 100644 --- a/STEER/AliPoints.h +++ b/STEER/AliPoints.h @@ -31,7 +31,7 @@ public: virtual void SetParticle(Int_t index) {fIndex = index;} protected: - void Copy(AliPoints &pts) const; + void Copy(TObject &pts) const; AliDetector *fDetector; //Pointer to AliDetector object Int_t fIndex; //Particle number in AliRun::fParticles diff --git a/STEER/AliRecPoint.cxx b/STEER/AliRecPoint.cxx index d1f8e5d47d7..183274095b9 100644 --- a/STEER/AliRecPoint.cxx +++ b/STEER/AliRecPoint.cxx @@ -152,29 +152,29 @@ void AliRecPoint::AddDigit(AliDigitNew & digit) // } //_______________________________________________________________________ -void AliRecPoint::Copy(AliRecPoint& recp) const +void AliRecPoint::Copy(TObject& recp) const { // // Copy *this onto pts // // Copy all first if(this != &recp) { - ((TObject*) this)->Copy(dynamic_cast(recp)); - recp.fAmp = fAmp; - recp.fGeom = fGeom; - recp.fIndexInList = fIndexInList; - recp.fLocPos = fLocPos; - recp.fLocPosM = new TMatrix(*fLocPosM); - recp.fMaxDigit = fMaxDigit; - recp.fMulDigit = fMulDigit; - recp.fMaxTrack = fMaxTrack; - recp.fMulTrack = fMulTrack; + ((TObject*) this)->Copy(recp); + (dynamic_cast(recp)).fAmp = fAmp; + (dynamic_cast(recp)).fGeom = fGeom; + (dynamic_cast(recp)).fIndexInList = fIndexInList; + (dynamic_cast(recp)).fLocPos = fLocPos; + (dynamic_cast(recp)).fLocPosM = new TMatrix(*fLocPosM); + (dynamic_cast(recp)).fMaxDigit = fMaxDigit; + (dynamic_cast(recp)).fMulDigit = fMulDigit; + (dynamic_cast(recp)).fMaxTrack = fMaxTrack; + (dynamic_cast(recp)).fMulTrack = fMulTrack; // Duplicate pointed objects - recp.fDigitsList = new Int_t[fMulDigit]; - memcpy(recp.fDigitsList,fDigitsList,fMulDigit*sizeof(Int_t)); - recp.fTracksList = new Int_t[fMulTrack]; - memcpy(recp.fTracksList,fTracksList,fMulTrack*sizeof(Int_t)); + (dynamic_cast(recp)).fDigitsList = new Int_t[fMulDigit]; + memcpy((dynamic_cast(recp)).fDigitsList,fDigitsList,fMulDigit*sizeof(Int_t)); + (dynamic_cast(recp)).fTracksList = new Int_t[fMulTrack]; + memcpy((dynamic_cast(recp)).fTracksList,fTracksList,fMulTrack*sizeof(Int_t)); } } diff --git a/STEER/AliRecPoint.h b/STEER/AliRecPoint.h index b75cd2d0f60..ae5702e561f 100644 --- a/STEER/AliRecPoint.h +++ b/STEER/AliRecPoint.h @@ -57,7 +57,7 @@ public: protected: - void Copy(AliRecPoint &recp) const; + void Copy(TObject &recp) const; Float_t fAmp ; // summed amplitude of digits AliGeometry * fGeom ; //! pointer to the geometry class diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx index 7691d378a72..94dbd0ff07a 100644 --- a/STEER/AliRun.cxx +++ b/STEER/AliRun.cxx @@ -216,7 +216,7 @@ AliRun::~AliRun() } //_______________________________________________________________________ -void AliRun::Copy(AliRun &) const +void AliRun::Copy(TObject &) const { Fatal("Copy","Not implemented!\n"); } diff --git a/STEER/AliRun.h b/STEER/AliRun.h index 76135cb873b..ec40d1462b3 100644 --- a/STEER/AliRun.h +++ b/STEER/AliRun.h @@ -150,7 +150,7 @@ protected: AliRunLoader *fRunLoader; //!run getter - written as a separate object private: - void Copy(AliRun &arun) const; + void Copy(TObject &arun) const; ClassDef(AliRun,8) //Supervisor class for all Alice detectors }; diff --git a/STEER/AliRunDigitizer.cxx b/STEER/AliRunDigitizer.cxx index e75329dab1f..e02c1be8040 100644 --- a/STEER/AliRunDigitizer.cxx +++ b/STEER/AliRunDigitizer.cxx @@ -210,7 +210,7 @@ AliRunDigitizer::AliRunDigitizer(const AliRunDigitizer& dig): } //_______________________________________________________________________ -void AliRunDigitizer::Copy(AliRunDigitizer&) const +void AliRunDigitizer::Copy(TObject&) const { Fatal("Copy","Not installed\n"); } diff --git a/STEER/AliRunDigitizer.h b/STEER/AliRunDigitizer.h index 829390c411a..f52c0288cb3 100644 --- a/STEER/AliRunDigitizer.h +++ b/STEER/AliRunDigitizer.h @@ -101,7 +101,7 @@ public: void SetDebug(Int_t level) {fDebug = level;} private: - void Copy(AliRunDigitizer& dig) const; + void Copy(TObject& dig) const; Bool_t ConnectInputTrees(); Bool_t InitGlobal(); Bool_t InitOutputGlobal(); diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx index 57c7f1e5f84..fa7001effff 100644 --- a/STEER/AliStack.cxx +++ b/STEER/AliStack.cxx @@ -100,7 +100,7 @@ AliStack::AliStack(const AliStack& st): } //_______________________________________________________________________ -void AliStack::Copy(AliStack&) const +void AliStack::Copy(TObject&) const { Fatal("Copy","Not implemented!\n"); } diff --git a/STEER/AliStack.h b/STEER/AliStack.h index 7c41a527839..4bb4b1aec94 100644 --- a/STEER/AliStack.h +++ b/STEER/AliStack.h @@ -85,7 +85,7 @@ class AliStack : public TVirtualMCStack Bool_t KeepPhysics(TParticle* part); private: - void Copy(AliStack &st) const; + void Copy(TObject &st) const; // data members TClonesArray *fParticles; //! Pointer to list of particles diff --git a/STEER/AliTrackMap.cxx b/STEER/AliTrackMap.cxx index bbce758a0cb..bc1ffd0876a 100644 --- a/STEER/AliTrackMap.cxx +++ b/STEER/AliTrackMap.cxx @@ -73,7 +73,7 @@ AliTrackMap::AliTrackMap(Int_t size, Int_t *array): } //_______________________________________________________________________ -void AliTrackMap::Copy(AliTrackMap& ) const +void AliTrackMap::Copy(TObject& ) const { Fatal("Copy","Not implemented\n"); } diff --git a/STEER/AliTrackMap.h b/STEER/AliTrackMap.h index c49052ebaae..b5f92398caf 100644 --- a/STEER/AliTrackMap.h +++ b/STEER/AliTrackMap.h @@ -36,7 +36,7 @@ public: void PrintValues() const; private: - void Copy(AliTrackMap &trm) const; + void Copy(TObject &trm) const; Int_t fSize; // size of the array Int_t *fArray; //[fSize] actual map -- 2.43.0