aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/util
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2016-05-31 17:13:51 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2016-05-31 17:13:51 +0200
commitd79eee05ef930d127cbae54c2a4f2e8508faaa38 (patch)
tree1f650fc65c0b4555a4e03c14a0b9165f6145a722 /Eigen/src/Core/util
parent2c1b56f4c13cb7fbc2834b30d673f6828d5eec79 (diff)
Fix compilation with old icc
Diffstat (limited to 'Eigen/src/Core/util')
-rw-r--r--Eigen/src/Core/util/Meta.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h
index 01a9647a3..7ecd59add 100644
--- a/Eigen/src/Core/util/Meta.h
+++ b/Eigen/src/Core/util/Meta.h
@@ -27,9 +27,11 @@ namespace internal {
* we however don't want to add a dependency to Boost.
*/
-#if EIGEN_COMP_ICC
-typedef intptr_t IntPtr;
-typedef uintptr_t UIntPtr;
+// 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
+typedef std::intptr_t IntPtr;
+typedef std::uintptr_t UIntPtr;
#else
typedef std::ptrdiff_t IntPtr;
typedef std::size_t UIntPtr;