Removing warnings on gcc 4.3

diff --git a/PHOS/AliPHOSJetFinder.cxx b/PHOS/AliPHOSJetFinder.cxx
index 53a1a2d066210d428ff07001b35c336562b5d56a..8cc03088b6fa85b61331153a6e5f2211685ace53 100644 (file)
--- a/PHOS/AliPHOSJetFinder.cxx
+++ b/PHOS/AliPHOSJetFinder.cxx
@@ -303,8 +303,8 @@ void AliPHOSJetFinder::FindJetsFromDigits(const TClonesArray * digits, TObjArray
        if(digit)
          totalEnergy+=energy[i] ;
       }
-      if(!fMode || (oldTotalEnergy != 0) && 
-        (TMath::Abs(oldTotalEnergy - totalEnergy)/oldTotalEnergy < fPrecBg))
+      if(!fMode || ((oldTotalEnergy != 0) && 
+                   (TMath::Abs(oldTotalEnergy - totalEnergy)/oldTotalEnergy < fPrecBg)))
        break ; 
     }
   }

diff --git a/STEER/TTreeStream.cxx b/STEER/TTreeStream.cxx
index 2287454cc2d547bb73d2acd071c97f16970298bd..6a9c992529e519dd22fa1c8f7705e1dcb2732df9 100644 (file)
--- a/STEER/TTreeStream.cxx
+++ b/STEER/TTreeStream.cxx
@@ -468,7 +468,7 @@ TTreeStream & TTreeStream::Endl()
 }
 
 
-TTreeStream  &TTreeStream::operator<<(Char_t *name)
+TTreeStream  &TTreeStream::operator<<(const Char_t *name)
 {
   //
   // Endl 

diff --git a/STEER/TTreeStream.h b/STEER/TTreeStream.h
index 1c72dc9a966ba898edb3d060bc0e7e8be2b55289..a5060a0d701caa06b6eab0567ce8743dac5ea51a 100644 (file)
--- a/STEER/TTreeStream.h
+++ b/STEER/TTreeStream.h
@@ -61,7 +61,7 @@ public:
   TTreeStream  &operator<<(Float_t   &f){CheckIn('F',&f);return *this;}
   TTreeStream  &operator<<(Double_t  &d){CheckIn('D',&d);return *this;}
   TTreeStream  &operator<<(TObject*o){CheckIn(o);return *this;} 
-  TTreeStream  &operator<<(Char_t *name);
+  TTreeStream  &operator<<(const Char_t *name);
  protected:
   //
 

diff --git a/TPC/AliDigits.cxx b/TPC/AliDigits.cxx
index 9dc17623a2c447c2a07358cc524e59ec64fb073c..3b8a655a756e456c26aefe7b2bebc6ac760b626a 100644 (file)
--- a/TPC/AliDigits.cxx
+++ b/TPC/AliDigits.cxx
@@ -431,7 +431,7 @@ Bool_t AliDigits::First0()
   fCurrentCol = -1;
   fCurrentIndex = -1;
   Int_t i;
-  for (i=0; (( i<fNelems) && (fElements->At(i)<=fThreshold));i++);  //MI1211
+  for (i=0; (( i<fNelems) && (fElements->At(i)<=fThreshold));i++) {}  //MI1211
   if (i == fNelems) return kFALSE;
   fCurrentCol =i/fNrows;
   fCurrentRow =i%fNrows;
@@ -446,7 +446,7 @@ Bool_t AliDigits::Next0()
   //
   if (fCurrentIndex<0) return kFALSE;  // if we didn't adjust first 
   Int_t i;
-  for (i=fCurrentIndex+1; ( (i<fNelems) && (fElements->At(i)<=fThreshold) ) ;i++);
+  for (i=fCurrentIndex+1; ( (i<fNelems) && (fElements->At(i)<=fThreshold) ) ;i++) {}
   if (i >= fNelems)  {
     fCurrentIndex = -1;
     return kFALSE;

diff --git a/TPC/AliSegmentArray.cxx b/TPC/AliSegmentArray.cxx
index aff63818b8d6699e4e84aa94a4c8a7d94f44fc78..0f4a23c468a324dc5b42e091a8850fac0d6a6f02 100644 (file)
--- a/TPC/AliSegmentArray.cxx
+++ b/TPC/AliSegmentArray.cxx
@@ -113,9 +113,9 @@ AliSegmentArray::~AliSegmentArray()
     fSegment->Delete();
     delete fSegment;
   }
-  if (fTree) 
+  if (fTree) { 
    if (fTreeOwner) delete fTree;
-   else fTree->Reset();
+   else fTree->Reset();}
 
   if (fTreeIndex) delete fTreeIndex;
   //  if (fClass!=0) delete fClass;
@@ -249,13 +249,13 @@ void AliSegmentArray::MakeTree(char *file)
 {
   //  AliSegmentID  segment;
   AliSegmentID * psegment = NewSegment();  
-  if (fTree) 
+  if (fTree) {
     if (fTreeOwner) 
      {
        delete fTree;
        fTree = new TTree("Segment Tree","Tree with segments");     
      }
-    else fTree->Reset();
+    else fTree->Reset();}
 
   
   //PH  fBranch = fTree->Branch("Segment",psegment->IsA()->GetName(),&psegment,64000);

diff --git a/TPC/AliTPCCalibCE.h b/TPC/AliTPCCalibCE.h
index 037504d2cc1a426ba593500271a6cc0ccd22a367..566fa079beae64bb645853bc8a918b9d16dc4e12 100644 (file)
--- a/TPC/AliTPCCalibCE.h
+++ b/TPC/AliTPCCalibCE.h
@@ -70,14 +70,14 @@ public:
     TH2S* GetHistoT0 (Int_t sector, Bool_t force=kFALSE);           // get refernce histogram
     TH2S* GetHistoRMS(Int_t sector, Bool_t force=kFALSE);           // get refernce histogram
 
-    const Float_t GetMeanT0rms() {return fMeanT0rms;}
-    const Float_t GetMeanQrms() {return fMeanQrms;}
-    const Float_t GetMeanRMSrms() {return fMeanRMSrms;}
-
-    const Int_t   GetPeakDetectionMinus(){return fPeakMinus;}
-    const Int_t   GetPeakDetectionPlus(){return fPeakPlus;}
-    const Float_t GetNnoiseThresholdMax() {return fNoiseThresholdMax;}
-    const Float_t GetNnoiseThresholdSum() {return fNoiseThresholdSum;}
+    Float_t GetMeanT0rms() const {return fMeanT0rms;}
+    Float_t GetMeanQrms() const {return fMeanQrms;}
+    Float_t GetMeanRMSrms() const {return fMeanRMSrms;}
+
+    Int_t   GetPeakDetectionMinus() const {return fPeakMinus;}
+    Int_t   GetPeakDetectionPlus()  const {return fPeakPlus;}
+    Float_t GetNnoiseThresholdMax() const {return fNoiseThresholdMax;}
+    Float_t GetNnoiseThresholdSum() const {return fNoiseThresholdSum;}
 
     TH1S* GetHistoTmean(Int_t sector, Bool_t force=kFALSE);           // get refernce histogram
 

diff --git a/TPC/AliTPCMonitorDialog.cxx b/TPC/AliTPCMonitorDialog.cxx
index 2bfab498a5253f83dddf3112e0494131f72f960e..cf15bbfe2a01061d420c5f17ea937a732b1b969d 100755 (executable)
--- a/TPC/AliTPCMonitorDialog.cxx
+++ b/TPC/AliTPCMonitorDialog.cxx
@@ -323,12 +323,12 @@ void AliTPCMonitorDialog::HandleButtons(Int_t id)
            if(s1=="all"){  fComponents[j] = -1;              }
            else         {  fComponents[j] = (int)atoi(s1.Data()); }
            if(
-              j==0 && (fComponents[j] < -1 || fComponents[j]>5000) ||
-              j==1 && (fComponents[j] < -1 || fComponents[j]>5   ) ||
-              j==2 && (fComponents[j] < -1 || fComponents[j]>1   ) ||
-              j==3 && (fComponents[j] < -1 || fComponents[j]>25  ) ||
-              j==4 && (fComponents[j] < -1 || fComponents[j]>6   ) ||
-              j==5 && (fComponents[j] < -1 || fComponents[j]>8   )    )
+              (j==0 && (fComponents[j] < -1 || fComponents[j]>5000)) ||
+              (j==1 && (fComponents[j] < -1 || fComponents[j]>5   )) ||
+              (j==2 && (fComponents[j] < -1 || fComponents[j]>1   )) ||
+              (j==3 && (fComponents[j] < -1 || fComponents[j]>25  )) ||
+              (j==4 && (fComponents[j] < -1 || fComponents[j]>6   )) ||
+              (j==5 && (fComponents[j] < -1 || fComponents[j]>8   ))    )
              {
                compsel =0;
                AliError("Settings out of range ( version 2) "); 

diff --git a/TPC/AliTPCParam.h b/TPC/AliTPCParam.h
index 5bae3b8d4c69823b7f4012caf8c6e429ce7a08f3..50509ddd4f40ce12afcd51de876b5e537a7983bd 100644 (file)
--- a/TPC/AliTPCParam.h
+++ b/TPC/AliTPCParam.h
@@ -545,9 +545,9 @@ inline void AliTPCParam::Transform2to1(Float_t *xyz, Int_t *index) const
   xyz[1]=y1;
   xyz[2]=fZLength-xyz[2]; 
   if (index[1]<fNInnerSector)
-    if ( index[1]>=(fNInnerSector>>1)) xyz[2]*=-1.;
+    {if ( index[1]>=(fNInnerSector>>1))        xyz[2]*=-1.;}
   else 
-    if ( (index[1]-fNInnerSector) >= (fNOuterSector>>1) )    xyz[2]*=-1;      
+    {if ( (index[1]-fNInnerSector) >= (fNOuterSector>>1) )    xyz[2]*=-1;}
   index[0]=1;
 }
 

diff --git a/TRD/AliTRDRawStream.cxx b/TRD/AliTRDRawStream.cxx
index ff3c13f897b90f3f920e3d739160dfb78ade1acf..3355fcb6443698fe7801b5b53b11d7af6cc73740 100644 (file)
--- a/TRD/AliTRDRawStream.cxx
+++ b/TRD/AliTRDRawStream.cxx
@@ -1138,8 +1138,8 @@ void AliTRDRawStream::DecodeTracklet()
   //             , *fDataWord, fSM, fLAYER, fSTACK, fSIDE+10
   //                , fTracklPadRow, fTracklPadPos, fTracklDefL, fTracklPID));
 
-  if( (fSTACK == 2) && (fTracklPadRow >= (Int_t) fGeo->RowmaxC0()) ||
-      (fSTACK != 2) && (fTracklPadRow >= (Int_t) fGeo->RowmaxC1()) ) {
+  if( ((fSTACK == 2) && (fTracklPadRow >= (Int_t) fGeo->RowmaxC0())) ||
+      ((fSTACK != 2) && (fTracklPadRow >= (Int_t) fGeo->RowmaxC1())) ) {
     AliWarning(Form("Strange Row read from Tracklet Word: %d", fTracklPadRow));
     fRawReader->AddMajorErrorLog(kTrackletRowMismatch,Form("Word: %d", fTracklPadRow));
   }

diff --git a/TRD/AliTRDRawStreamV2.cxx b/TRD/AliTRDRawStreamV2.cxx
index 3792d6e29c5c9a6d8699b93beb72a15f4273ad8b..dc62b9291269800e8537359be2523c3b769c9eb0 100644 (file)
--- a/TRD/AliTRDRawStreamV2.cxx
+++ b/TRD/AliTRDRawStreamV2.cxx
@@ -692,8 +692,8 @@ void AliTRDRawStreamV2::DecodeTracklet()
   //             , *fDataWord, fSM, fLAYER, fSTACK, fSIDE+10
   //                , fTracklPadRow, fTracklPadPos, fTracklDefL, fTracklPID));
 
-  if( (fSTACK == 2) && (fTracklPadRow >= (Int_t) fGeo->RowmaxC0()) ||
-      (fSTACK != 2) && (fTracklPadRow >= (Int_t) fGeo->RowmaxC1()) ) {
+  if( ((fSTACK == 2) && (fTracklPadRow >= (Int_t) fGeo->RowmaxC0())) ||
+      ((fSTACK != 2) && (fTracklPadRow >= (Int_t) fGeo->RowmaxC1())) ) {
     AliWarning(Form("Strange Row read from Tracklet Word: %d", fTracklPadRow));
     fRawReader->AddMajorErrorLog(kTrackletRowMismatch,Form("Word: %d", fTracklPadRow));
   }

diff --git a/TRD/AliTRDalignment.cxx b/TRD/AliTRDalignment.cxx
index 073be48bea65c771e9be15db9061d041b71cf59e..525ce76cc126d59ea06eb5aee6e814625e2d7490 100644 (file)
--- a/TRD/AliTRDalignment.cxx
+++ b/TRD/AliTRDalignment.cxx
@@ -915,9 +915,9 @@ void trdAlignmentFcn(int &npar, double *g, double &f, double *par, int iflag) {
   AliTRDalignment *alignment = (AliTRDalignment*) gMinuit->GetObjectFit(); 
 
   f = alignment->SurveyChi2(par);
-  if (iflag==3);
-  if (npar); 
-  if (g); // no warnings about unused stuff...
+  if (iflag==3) {}
+  if (npar) {} 
+  if (g) {} // no warnings about unused stuff...
 
 }
 

diff --git a/TRD/AliTRDdataArrayF.cxx b/TRD/AliTRDdataArrayF.cxx
index 7c69bb7e4c696a12bf88dc5ec6b22f8463143a87..dad99146e0d1749800f8ef50de76c3efe0318b6e 100644 (file)
--- a/TRD/AliTRDdataArrayF.cxx
+++ b/TRD/AliTRDdataArrayF.cxx
@@ -517,7 +517,7 @@ Bool_t AliTRDdataArrayF::Next0()
   Int_t i;
   for (i = fCurrentIndex + 1; 
        ((i < fNelems) && (fElements->At(i) <= fThreshold)); 
-       i++);
+       i++) {}
   if (i >= fNelems)  {
     fCurrentIndex = -1;
     return kFALSE;

diff --git a/TRD/AliTRDdataArrayI.cxx b/TRD/AliTRDdataArrayI.cxx
index f6816364f461d30b576f11113e857a7051a5dd6e..20f259d767e1fb9add669982fffe033c7580c904 100644 (file)
--- a/TRD/AliTRDdataArrayI.cxx
+++ b/TRD/AliTRDdataArrayI.cxx
@@ -516,7 +516,7 @@ Bool_t AliTRDdataArrayI::Next0()
   Int_t i;
   for (i = fCurrentIndex + 1; 
        ((i < fNelems) && (fElements->At(i) <= fThreshold)); 
-       i++);
+       i++) {}
   if (i >= fNelems)  {
     fCurrentIndex = -1;
     return kFALSE;

diff --git a/TRD/AliTRDdataArrayS.cxx b/TRD/AliTRDdataArrayS.cxx
index e84364258bdf849dbb0db429a986c30ede429012..1e9d00eac694927c83b9c783d7edde625ec83bd5 100644 (file)
--- a/TRD/AliTRDdataArrayS.cxx
+++ b/TRD/AliTRDdataArrayS.cxx
@@ -518,7 +518,7 @@ Bool_t AliTRDdataArrayS::Next0()
   Int_t i;
   for (i = fCurrentIndex + 1; 
        ((i < fNelems) && (fElements->At(i) <= fThreshold)); 
-       i++);
+       i++) {}
   if (i >= fNelems)  {
     fCurrentIndex = -1;
     return kFALSE;

diff --git a/TRD/AliTRDtrackerV1.cxx b/TRD/AliTRDtrackerV1.cxx
index 2763f1ecf08e9a69d2bf9046b2177bb252c2c335..a9a17efe2118e7bd847a072d7c3a5a46ac88a3f9 100644 (file)
--- a/TRD/AliTRDtrackerV1.cxx
+++ b/TRD/AliTRDtrackerV1.cxx
@@ -172,7 +172,7 @@ Bool_t AliTRDtrackerV1::GetTrackPoint(Int_t index, AliTrackPoint &p) const
   
   // get detector for this tracklet
   AliTRDcluster *cl = 0x0;
-  Int_t ic = 0; do; while(!(cl = tracklet->GetClusters(ic++)));         
+  Int_t ic = 0; do {} while(!(cl = tracklet->GetClusters(ic++)));
   Int_t  idet     = cl->GetDetector();
     
   Double_t local[3];

diff --git a/TRD/AliTRDtrackerV1.h b/TRD/AliTRDtrackerV1.h
index 48b30a9f140ee744e64a46fb086ce2d7c1e8531e..3053db2267d3aec3553d036b3123927ea9fa969c 100644 (file)
--- a/TRD/AliTRDtrackerV1.h
+++ b/TRD/AliTRDtrackerV1.h
@@ -74,10 +74,10 @@ public:
   AliCluster*     GetCluster(Int_t index) const;
   AliTRDseedV1*   GetTracklet(Int_t index) const;
   AliKalmanTrack* GetTrack(Int_t index) const;
-  TClonesArray*   GetListOfClusters() {return fClusters;}
-  TClonesArray*   GetListOfTracklets() {return fTracklets;}
-  TClonesArray*   GetListOfTracks() {return fTracks;}
-  static const Int_t     GetNTimeBins() {return fgNTimeBins;}
+  TClonesArray*   GetListOfClusters() const {return fClusters;}
+  TClonesArray*   GetListOfTracklets() const {return fTracklets;}
+  TClonesArray*   GetListOfTracks() const {return fTracks;}
+  static Int_t     GetNTimeBins() {return fgNTimeBins;}
   static void     GetExtrapolationConfig(Int_t iconfig, Int_t planes[2]);
   static void     GetSeedingConfig(Int_t iconfig, Int_t planes[4]);
   static TLinearFitter*  GetTiltedRiemanFitter();

diff --git a/TRD/AliTRDtrapAlu.cxx b/TRD/AliTRDtrapAlu.cxx
index fcdab3d106203b706e0af571edcb265124aa74bc..005cdca549c0283a40233d086eb56435f62a3616 100644 (file)
--- a/TRD/AliTRDtrapAlu.cxx
+++ b/TRD/AliTRDtrapAlu.cxx
@@ -130,7 +130,7 @@ AliTRDtrapAlu& AliTRDtrapAlu::AssignInt(const Int_t& first){
     \r
     //setting fValue to maximum; first was to big\r
     fValue  = fuRestriction;\r
-    fValue  = fValue & LUT(exponent)-1;\r
+    fValue  = fValue & (LUT(exponent)-1);\r
     return *this;\r
   }\r
 \r
@@ -138,14 +138,14 @@ AliTRDtrapAlu& AliTRDtrapAlu::AssignInt(const Int_t& first){
     \r
     //setting fValue to minimum; first was to small\r
     fValue  = flRestriction;\r
-    fValue  = fValue & LUT(exponent)-1;\r
+    fValue  = fValue & (LUT(exponent)-1);\r
     return *this;\r
   }\r
 \r
   \r
   fValue  = first;\r
   fValue  = fValue<<fPostCom; \r
-  fValue  = fValue & LUT(exponent)-1;\r
+  fValue  = fValue & (LUT(exponent)-1);\r
  \r
   return *this;\r
     \r

diff --git a/TRD/qaRec/AliTRDtrackingEfficiencyCombined.cxx b/TRD/qaRec/AliTRDtrackingEfficiencyCombined.cxx
index 978102b56681688a72bcea73ddf0aa7f034209b3..1d0fdfa8a9a1b34bb5446b775f481ccc0dc5f7bf 100644 (file)
--- a/TRD/qaRec/AliTRDtrackingEfficiencyCombined.cxx
+++ b/TRD/qaRec/AliTRDtrackingEfficiencyCombined.cxx
@@ -106,7 +106,7 @@ void AliTRDtrackingEfficiencyCombined::Exec(Option_t *){
                        }
                        if(trkInf->GetNTrackRefs()){
                                Int_t iref = 0;
-                               while(!(trackRef = trkInf->GetTrackRef(iref++)));
+                               while(!(trackRef = trkInf->GetTrackRef(iref++))) {}
                        }
                        if(!trackRef) printf("Error: Track Reference missing for Track %d\n", trkInf->GetLabel());
                        mom =  trackRef ? trackRef->P() : trkInf->GetOuterParam()->P();