From 487edbf325d6c64fad23bc93bb425be408098927 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Mon, 4 May 2009 12:14:37 +0000 Subject: [PATCH] backport 963281, fix msvc detection on win64 --- Eigen/Core | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Eigen/Core b/Eigen/Core index 211e0f9c7..f5e315a2c 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -7,11 +7,10 @@ #ifdef _MSC_VER #include // for _aligned_malloc -- need it regardless of whether vectorization is enabled #if (_MSC_VER >= 1500) // 2008 or later - // Remember that usage of defined() in a #define is undefined by the standard - #ifdef _M_IX86_FP - #if _M_IX86_FP >= 2 - #define EIGEN_SSE2_ON_MSVC_2008_OR_LATER - #endif + // Remember that usage of defined() in a #define is undefined by the standard. + // a user reported that in 64-bit mode, MSVC doesn't care to define _M_IX86_FP. + #if (defined(_M_IX86_FP) && (_M_IX86_FP >= 2)) || defined(_M_X64) + #define EIGEN_SSE2_ON_MSVC_2008_OR_LATER #endif #endif #endif