From 8ec4d6480d9ab9569b1cf9ad6e4bd6343d749409 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Wed, 6 Jul 2016 14:07:14 +0200 Subject: [PATCH] Fix compilation with recent updates of icc 2016 --- Eigen/src/Core/util/Meta.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 Eigen/src/Core/util/Meta.h diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h old mode 100644 new mode 100755 index 9d0e7c266..dad0c1d56 --- a/Eigen/src/Core/util/Meta.h +++ b/Eigen/src/Core/util/Meta.h @@ -16,6 +16,10 @@ #include #endif +#if EIGEN_COMP_ICC>=1600 && __cplusplus >= 201103L +#include +#endif + namespace Eigen { namespace internal { @@ -29,7 +33,7 @@ namespace internal { // Only recent versions of ICC complain about using ptrdiff_t to hold pointers, // and older versions do not provide *intptr_t types. -#if EIGEN_COMP_ICC>=1600 +#if EIGEN_COMP_ICC>=1600 && __cplusplus >= 201103L typedef std::intptr_t IntPtr; typedef std::uintptr_t UIntPtr; #else