fix Savanah bug #102665: code fixes, important for c++98, necessary for c++11 (Laurent)
authorpcrochet <pcrochet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 3 Oct 2013 12:31:24 +0000 (12:31 +0000)
committerpcrochet <pcrochet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 3 Oct 2013 12:31:24 +0000 (12:31 +0000)
PWG/muondep/AliAnalysisMuMu.cxx
PWG/muondep/AliAnalysisMuMuGraphUtil.cxx
PWG/muondep/AliAnalysisTriggerScalers.cxx

index 4b79476..4ca56ea 100644 (file)
@@ -2946,7 +2946,7 @@ void AliAnalysisMuMu::TriggerCountCoverage(const char* triggerList,
       }
       else
       {
-        messages.insert(std::make_pair<ULong64_t,std::string>(nmax,msg.Data()));
+        messages.insert(std::make_pair(nmax,static_cast<string>(msg.Data())));
       }
     }
   }
index ed6bb59..7468836 100644 (file)
@@ -79,7 +79,7 @@ TGraphErrors* AliAnalysisMuMuGraphUtil::Combine(TObjArray& graphs, Bool_t compac
         quartet.push_back(0.0);
       }
       
-      values.insert( std::make_pair<int, std::vector<double> >(runNumber,quartet));      
+      values.insert( std::make_pair(runNumber,quartet));      
     }
   }
   
index 95fb28c..4207b8a 100644 (file)
@@ -296,7 +296,7 @@ void AliAnalysisTriggerScalers::GetFillBoundaries(std::map<int, std::pair<int,in
     }
     else
     {
-      fills[fill] = make_pair<int,int>(runnumber,runnumber);
+      fills[fill] = make_pair(runnumber,runnumber);
     }
   }
 }
@@ -453,7 +453,7 @@ void AliAnalysisTriggerScalers::GetLHCPeriodBoundaries(std::map<std::string, std
     }
     else
     {
-      periods[period] = make_pair<int,int>(runnumber,runnumber);
+      periods[period] = make_pair(runnumber,runnumber);
     }
   }
 }