merge with default branch

This commit is contained in:
Gael Guennebaud
2014-07-10 22:04:45 +02:00
49 changed files with 263 additions and 167 deletions

View File

@@ -212,7 +212,7 @@
#endif
// required for __cpuid, needs to be included after cmath
#if defined(_MSC_VER) && (defined(_M_IX86)||defined(_M_X64))
#if defined(_MSC_VER) && (defined(_M_IX86)||defined(_M_X64)) && (!defined(_WIN32_WCE))
#include <intrin.h>
#endif