]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
fixed warning
authorjgrosseo <jgrosseo@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 24 Mar 2010 16:21:39 +0000 (16:21 +0000)
committerjgrosseo <jgrosseo@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 24 Mar 2010 16:21:39 +0000 (16:21 +0000)
ANALYSIS/AliTriggerAnalysis.cxx

index e50714562db48bdcc976592cf3c4fb59ed12281a..16fa060b827adbb60d2456704f717ccf24b20a5f 100644 (file)
@@ -923,12 +923,12 @@ Long64_t AliTriggerAnalysis::Merge(TCollection* list)
 
     // merge fTriggerClasses
     TIterator* iter2 = entry->fTriggerClasses->MakeIterator();
-    TObjString* obj = 0;
-    while ((obj = dynamic_cast<TObjString*> (iter2->Next())))
+    TObjString* obj2 = 0;
+    while ((obj2 = dynamic_cast<TObjString*> (iter2->Next())))
     {
-      TParameter<Long64_t>* param2 = dynamic_cast<TParameter<Long64_t>*> (entry->fTriggerClasses->GetValue(obj));
+      TParameter<Long64_t>* param2 = dynamic_cast<TParameter<Long64_t>*> (entry->fTriggerClasses->GetValue(obj2));
       
-      TParameter<Long64_t>* param1 = dynamic_cast<TParameter<Long64_t>*> (fTriggerClasses->GetValue(obj));
+      TParameter<Long64_t>* param1 = dynamic_cast<TParameter<Long64_t>*> (fTriggerClasses->GetValue(obj2));
       if (param1)
       {
         param1->SetVal(param1->GetVal() + param2->GetVal());
@@ -936,7 +936,7 @@ Long64_t AliTriggerAnalysis::Merge(TCollection* list)
       else
       {
         param1 = dynamic_cast<TParameter<Long64_t>*> (param2->Clone());
-        fTriggerClasses->Add(new TObjString(obj->String()), param1);
+        fTriggerClasses->Add(new TObjString(obj2->String()), param1);
       }
     }