Fixes for bug #71984 ENUM_AS_BOOLEAN problem reported by Coverity

diff --git a/EMCAL/AliCaloCalibPedestal.cxx b/EMCAL/AliCaloCalibPedestal.cxx
index c3ec750..f1a215c 100644 (file)
--- a/EMCAL/AliCaloCalibPedestal.cxx
+++ b/EMCAL/AliCaloCalibPedestal.cxx
@@ -448,7 +448,7 @@ void AliCaloCalibPedestal::SetParametersFromFile(const char *parameterFile)
       s >> keyValue;
       
       // check stream status
-      if( s.rdstate() & ios::failbit ) break;
+      if( ( s.rdstate() & ios::failbit ) == ios::failbit ) break;
                        
       // skip rest of line if comments found
       if( keyValue.substr( 0, 2 ) == "//" ) break;

diff --git a/EMCAL/AliCaloCalibSignal.cxx b/EMCAL/AliCaloCalibSignal.cxx
index 0977c4e..83e812a 100644 (file)
--- a/EMCAL/AliCaloCalibSignal.cxx
+++ b/EMCAL/AliCaloCalibSignal.cxx
@@ -334,7 +334,7 @@ void AliCaloCalibSignal::SetParametersFromFile(const char *parameterFile)
       s >> keyValue;
       
       // check stream status
-      if( s.rdstate() & ios::failbit ) break;
+      if( ( s.rdstate() & ios::failbit ) == ios::failbit ) break;
                        
       // skip rest of line if comments found
       if( keyValue.substr( 0, 2 ) == "//" ) break;

diff --git a/EVE/EveBase/AliEveMacroExecutor.cxx b/EVE/EveBase/AliEveMacroExecutor.cxx
index 0a5a9af..ffd608f 100644 (file)
--- a/EVE/EveBase/AliEveMacroExecutor.cxx
+++ b/EVE/EveBase/AliEveMacroExecutor.cxx
@@ -136,7 +136,7 @@ void AliEveMacroExecutor::ExecMacros()
        G__security_recover(0);
       }
 
-      if (error)
+      if (error != TInterpreter::kNoError)
       {
         mac->SetExecError();
         Error("ExecMacros", "Executing %s::%s, CINT error ... hopefully recovered.",

diff --git a/FASTSIM/AliQuenchingWeights.h b/FASTSIM/AliQuenchingWeights.h
index 81e5d18..9348ac0 100644 (file)
--- a/FASTSIM/AliQuenchingWeights.h
+++ b/FASTSIM/AliQuenchingWeights.h
@@ -120,7 +120,7 @@ class AliQuenchingWeights : public TObject {
   Float_t GetMu()           const {return fMu;}
   Float_t GetQTransport()   const {return fQTransport;}
   Float_t GetK()            const {return fK;}
-  Bool_t  GetECMethod()     const {return fECMethod;}
+  kECMethod  GetECMethod()  const {return fECMethod;}
   Bool_t  GetTablesLoaded() const {return fTablesLoaded;}
   Bool_t  GetMultSoft()     const {return fMultSoft;}
   Int_t   GetLengthMax()    const {return fLengthMax;}

diff --git a/ITS/AliITSvSDD03.cxx b/ITS/AliITSvSDD03.cxx
index 2bde377..41ecc69 100644 (file)
--- a/ITS/AliITSvSDD03.cxx
+++ b/ITS/AliITSvSDD03.cxx
@@ -339,7 +339,7 @@ void AliITSvSDD03::CreateGeometry(){
     gMC->Gspos("IDET",2,"ITSV",pdet2X,pdet2Y,pdet2Z,idrotm[0],"ONLY");// Detector2
 
 // Target definition and placement
-    if(fTarg){
+    if(fTarg != kNoTarg){
       data[0] = 30*kmm;
       data[1] = fTargThick*kmm;  // Target thickness
       data[2] = 30*kmm;

diff --git a/STEER/AliGeomManager.cxx b/STEER/AliGeomManager.cxx
index f0bad5d..a193e71 100644 (file)
--- a/STEER/AliGeomManager.cxx
+++ b/STEER/AliGeomManager.cxx
@@ -293,7 +293,7 @@ AliGeomManager::ELayerID AliGeomManager::VolUIDToLayerSafe(UShort_t voluid, Int_
   // Checks the validity of the given voluid
   //
   ELayerID layId = VolUIDToLayerSafe(voluid);
-  if(layId){
+  if(layId != AliGeomManager::kInvalidLayer){
     Int_t mId = Int_t(voluid & 0x7ff);
     if( mId>=0 && mId<LayerSize(layId)){
       modId = mId;