Merge pull request #7406 from ktf/fix-intel2

Misc ICC errors fixes.
cms-sw · Jan 29, 2015 · d396872 · d396872
2 parents 0c4ed13 + f762ec0
commit d396872
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/HLTrigger/Egamma/src/HLTEgammaDoubleLegCombFilter.cc b/HLTrigger/Egamma/src/HLTEgammaDoubleLegCombFilter.cc
@@ -111,7 +111,7 @@ void  HLTEgammaDoubleLegCombFilter::matchCands(const std::vector<math::XYZPoint>
 
   for(size_t secondLegNr=0;secondLegNr<secondLegP3s.size();secondLegNr++){
     if(!std::binary_search(matched2ndLegs.begin(),matched2ndLegs.end(),secondLegNr)){ //wasnt matched already
-      matchedCands.push_back(std::make_pair<int,int>(-1,secondLegNr));
+      matchedCands.push_back(std::make_pair<int,int>(-1, static_cast<int>(secondLegNr)));
     }
   }
 }

diff --git a/RecoLocalCalo/EcalRecAlgos/src/ESRecHitSimAlgo.cc b/RecoLocalCalo/EcalRecAlgos/src/ESRecHitSimAlgo.cc
@@ -51,7 +51,7 @@ EcalRecHit::ESFlags ESRecHitSimAlgo::evalAmplitude(float * results, const ESData
 
   // A from analytical formula:
   constexpr float t1 = 20.;
-  #ifdef __clang__
+  #if defined(__clang__) || defined(__INTEL_COMPILER)
   const float A_1 = 1./( std::pow(w/n*(t1),n) * std::exp(n-w*(t1)) );
   #else
   constexpr float A_1 = 1./( std::pow(w/n*(t1),n) * std::exp(n-w*(t1)) );