From 0068d3ccf62c3e2960e3f9eb4a31562c0f5025d7 Mon Sep 17 00:00:00 2001 From: Hauke Heibel Date: Thu, 24 Jun 2010 10:05:24 +0200 Subject: [PATCH] Added version testing for MSVC. --- Eigen/src/Core/util/Memory.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index 1fc0a6ccf..39e74cda1 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -596,8 +596,10 @@ public: __asm__ __volatile__ ("cpuid": "=a" (abcd[0]), "=b" (abcd[1]), "=c" (abcd[2]), "=d" (abcd[3]) : "a" (func), "c" (id) ); # endif #elif defined(_MSC_VER) +#if (_MSC_VER > 1500) /* newer than MSVC++ 9.0 */ || (_MSC_VER == 1500 && _MSC_FULL_VER >= 150030729) /* MSVC++ 9.0 with SP1*/ # define EIGEN_CPUID(abcd,func,id) __cpuidex((int*)abcd,func,id) #endif +#endif #ifdef EIGEN_CPUID inline bool ei_cpuid_is_vendor(int abcd[4], const char* vendor)