Merge pull request #13658 from davidlt/fix-icc-GsfBetheHeitlerUpdator

Do not use constexpr with std::log in C++14 for ICC
cms-sw · Mar 10, 2016 · eb89ad7 · eb89ad7
2 parents 5518252 + 519c2e1
commit eb89ad7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/TrackingTools/GsfTracking/src/GsfBetheHeitlerUpdator.cc b/TrackingTools/GsfTracking/src/GsfBetheHeitlerUpdator.cc
@@ -20,7 +20,7 @@ namespace {
   /// Second moment of the Bethe-Heitler distribution (in z=E/E0)
   inline float BetheHeitlerVariance (const float rl)
   {
-#if __clang__
+#if defined(__clang__) || defined(__INTEL_COMPILER)
     const
 #else
     constexpr