fix compiler warnings

diff --git a/HLT/global/AliFlatESDEvent.h b/HLT/global/AliFlatESDEvent.h
index 3b3d536250e2a4cc8eed87cfe59db00a870086bf..bf4f962a2b04f5943c2850a74934ee0032501e06 100644 (file)
--- a/HLT/global/AliFlatESDEvent.h
+++ b/HLT/global/AliFlatESDEvent.h
@@ -55,9 +55,13 @@ class AliFlatESDEvent :public AliVEvent {
   UInt_t GetEventSpecie()   const { return fEventSpecie; }
   Int_t  GetNumberOfKinks() const { return 0; }  
 
-  AliVTrack  *GetVTrack( Int_t i ) { return GetFlatTrackNonConst(i); }
+  AliVTrack  *GetVTrack( Int_t i ) const { return GetFlatTrackNonConst(i); }
   AliESDkink *GetKink(Int_t /*i*/) const { return NULL;}
 
+  using AliVEvent::GetPrimaryVertex;
+  using AliVEvent::GetPrimaryVertexTPC;
+  using AliVEvent::GetPrimaryVertexSPD;
+  using AliVEvent::GetPrimaryVertexTracks;
   Int_t GetPrimaryVertex( AliESDVertex &v ) const ;
   Int_t GetPrimaryVertexTPC( AliESDVertex &v ) const ;
   Int_t GetPrimaryVertexSPD( AliESDVertex &v ) const ;
@@ -109,7 +113,7 @@ class AliFlatESDEvent :public AliVEvent {
   const AliFlatESDV0      *GetV0s() const { return reinterpret_cast<const AliFlatESDV0*>( fContent + fV0Pointer ); }
 
   const AliFlatESDTrack  *GetFlatTrack( Int_t i ) const ;
-  AliFlatESDTrack  *GetFlatTrackNonConst( Int_t i );
+  AliFlatESDTrack  *GetFlatTrackNonConst( Int_t i ) const;
 
   // --------------------------------------------------------------------------------
   // -- Size methods
@@ -201,11 +205,11 @@ class AliFlatESDEvent :public AliVEvent {
 
 // Inline implementations 
 
-inline AliFlatESDTrack  *AliFlatESDEvent::GetFlatTrackNonConst( Int_t i )  
+inline AliFlatESDTrack  *AliFlatESDEvent::GetFlatTrackNonConst( Int_t i ) const 
 { 
   const Long64_t *table = reinterpret_cast<const Long64_t*> (fContent + fTrackTablePointer);
   if( i<0 || i>(int) fNTracks || table[i]<0 ) return NULL;
-  return reinterpret_cast<AliFlatESDTrack*>( fContent + table[i] );
+  return reinterpret_cast<AliFlatESDTrack*>( const_cast<Byte_t*>(fContent + table[i]) );
 }
 
 inline const AliFlatESDTrack  *AliFlatESDEvent::GetFlatTrack( Int_t i ) const 

diff --git a/HLT/global/AliFlatESDTrack.h b/HLT/global/AliFlatESDTrack.h
index 0e4c9bdaf05c7814f624059ba80a469874004a95..09c348e1bf6d3af08b0794f4690504b2fc0be8fd 100644 (file)
--- a/HLT/global/AliFlatESDTrack.h
+++ b/HLT/global/AliFlatESDTrack.h
@@ -106,6 +106,7 @@ class AliFlatESDTrack :public AliVTrack {
   // AliVParticle interface
   virtual Double_t Pt() const {const AliFlatExternalTrackParam* p=GetFlatTrackParam(); return (p)?p->GetPt():kVeryBig;}
   virtual Double_t GetTgl()  const {const AliFlatExternalTrackParam* p=GetFlatTrackParam(); return (p)?p->GetTgl():kVeryBig;}
+  using AliVTrack::GetImpactParameters;
   virtual void GetImpactParameters(Float_t &xy,Float_t &z) const {xy=0.; z=0.;}
   virtual Double_t Px() const {return 0.;}
   virtual Double_t Py() const {return 0.;}

diff --git a/STEER/CMakelibSTEERBase.pkg b/STEER/CMakelibSTEERBase.pkg
index 2327656a02ed748bab7d818258cf7b4ed8024ee1..acbb0c0f4f0dcc67d2176e3066585bd83f49fe00 100644 (file)
--- a/STEER/CMakelibSTEERBase.pkg
+++ b/STEER/CMakelibSTEERBase.pkg
@@ -97,6 +97,8 @@ set ( SRCS
     STEERBase/AliVTOFMatch.cxx
     STEERBase/AliVTOFcluster.cxx
     STEERBase/AliVMisc.cxx
+    STEERBase/AliVfriendTrack.cxx
+    STEERBase/AliVfriendEvent.cxx
   )
 
 string(REPLACE ".cxx" ".h" HDRS  "${SRCS}")

diff --git a/STEER/STEERBase/AliVEvent.h b/STEER/STEERBase/AliVEvent.h
index 481064674a487c9f6d55671f4fd60975904cb46a..0795d5b00e6a9d90378832e0ed0b8fa62d4409e3 100644 (file)
--- a/STEER/STEERBase/AliVEvent.h
+++ b/STEER/STEERBase/AliVEvent.h
@@ -154,6 +154,7 @@ public:
   // Tracks
   virtual AliVParticle *GetTrack(Int_t i) const = 0;
   virtual AliVTrack    *GetVTrack(Int_t /*i*/) const {return NULL;}
+  //virtual AliVTrack    *GetVTrack(Int_t /*i*/) {return NULL;}
   //virtual Int_t        AddTrack(const AliVParticle *t) = 0;
   virtual Int_t        GetNumberOfTracks() const = 0;
   virtual Int_t        GetNumberOfV0s() const = 0;