adding parentheses following gcc 4.3 suggestion
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 8 Nov 2008 12:34:25 +0000 (12:34 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 8 Nov 2008 12:34:25 +0000 (12:34 +0000)
HLT/BASE/AliHLTComponent.cxx
HLT/RCU/AliHLTAltroGenerator.cxx
HLT/TPCLib/AliHLTTPCHistogramHandlerComponent.cxx
HLT/sim/AliHLTSimulation.cxx

index 641f4d88228f1aee4423d7689c2a5dfcf89171c2..9728975edcbbd200e78cd7f0ce106554d73dcbbf 100644 (file)
@@ -609,7 +609,7 @@ int AliHLTComponent::FindMatchingDataTypes(AliHLTComponent* pConsumer, AliHLTCom
       }
       
       AliHLTComponentDataTypeList::iterator itype=itypes.begin();
-      for ( ; itype!=itypes.end() && (*itype)!=(*otype) ; itype++);
+      for ( ; itype!=itypes.end() && (*itype)!=(*otype) ; itype++) {/* empty body */};
       //if (itype!=itypes.end()) PrintDataTypeContent(*itype, "consumer \'%s\'");
       if (itype!=itypes.end()) {
        if (tgtList) tgtList->push_back(*otype);
index a12a5dd06513c3702893052cf6c671e430789ade..7d227e38b42fd6b60c9e2856659c6ec5ff379f34 100644 (file)
@@ -420,13 +420,13 @@ bool AliHLTAltroGenerator::Next()
   bool haveData=false;
   if (!fpSimData) return false;
   do {
-    if (haveData=(fCurrentTimeOffset>=0 &&
-                 fCurrentBunch>0 &&
-                 ++fCurrentTimeOffset<GetBunchSize())) {
+    if ((haveData=(fCurrentTimeOffset>=0 &&
+                  fCurrentBunch>0 &&
+                  ++fCurrentTimeOffset<GetBunchSize()))) {
       break;
     }
 
-    if (haveData=(NextBunch() && GetBunchSize()>0)) {
+    if ((haveData=(NextBunch()) && GetBunchSize()>0)) {
       fCurrentTimeOffset=0;
       break;
     }
@@ -499,7 +499,7 @@ bool AliHLTAltroGenerator::NextBunch()
     if (fDirection==kBackwards) {
       if (fCurrentBunch<0) {
        // bunch count in channel end - 1
-       if (haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fEnd-1))>0) {
+       if ((haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fEnd-1))>0)) {
          // first bunch length at channel end - 2
          fCurrentBunch=fChannelPositions[fCurrentPosition].fEnd-2;
        }
@@ -515,7 +515,7 @@ bool AliHLTAltroGenerator::NextBunch()
     } else if (fDirection==kForwards) {
       if (fCurrentBunch<0) {
        // bunch count in channel start + 1
-       if (haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fPosition+1))>0) {
+       if ((haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fPosition+1))>0)) {
          // first bunch length at channel start + 2
          fCurrentBunch=fChannelPositions[fCurrentPosition].fPosition+2;
        }
index e58b569f7cc8c0887f52150a3a8da92c9f043afb..a6f71255d8737ad5abc3d042066c496df29dc43f 100644 (file)
@@ -355,8 +355,8 @@ int AliHLTTPCHistogramHandlerComponent::DoEvent(const AliHLTComponentEventData&/
 
       for(UInt_t i=0;i<fHistogramData.size();i++){
        if(histName.CompareTo(fHistogramData.at(i).fHistogram->GetName())==0){
-         if(minSlice==fHistogramData.at(i).fMinSlice && maxSlice == fHistogramData.at(i).fMaxSlice || fIgnoreSpecification == kTRUE){
-           if(minPartition==fHistogramData.at(i).fMinPartition && maxPartition == fHistogramData.at(i).fMaxPartition || fIgnoreSpecification == kTRUE){
+         if((minSlice==fHistogramData.at(i).fMinSlice && maxSlice == fHistogramData.at(i).fMaxSlice) || fIgnoreSpecification == kTRUE){
+           if((minPartition==fHistogramData.at(i).fMinPartition && maxPartition == fHistogramData.at(i).fMaxPartition) || fIgnoreSpecification == kTRUE){
              fHistogramData.at(i).fHistogram->Add(tmp);
              histogramNotAdded = kFALSE;
              break;
index 3b7f0e8896032c53ff21141dce94e33bbaa6a5f7..a5304a05e3e86162938de631716c19cbb814fd3c 100644 (file)
@@ -127,7 +127,7 @@ int AliHLTSimulation::Init(AliRunLoader* pRunLoader, const char* options)
        if (fpRawReader) {
            fpRawReader->RewindEvents();
            int count=0;
-           for ( ; fpRawReader->NextEvent(); count++);
+           for ( ; fpRawReader->NextEvent(); count++) {/* empty body */};
            if (count!=pRunLoader->GetNumberOfEvents()) {
              AliError(Form("mismatch in event count: runloader %d, rawreader %d; ignoring rawreader", 
                            pRunLoader->GetNumberOfEvents(), count));