ICC 12 / linux only defined __INTEL_COMPILER, not __intel_compiler

This commit is contained in:
Benoit Jacob 2011-02-22 09:32:39 -05:00
parent d8e97aee89
commit 720767ae40
2 changed files with 3 additions and 3 deletions

View File

@ -142,14 +142,14 @@
#define EIGEN_ALWAYS_INLINE_ATTRIB #define EIGEN_ALWAYS_INLINE_ATTRIB
#endif #endif
#if EIGEN_GNUC_AT_LEAST(4,1) && !defined(__clang__) && !defined(__intel_compiler) #if EIGEN_GNUC_AT_LEAST(4,1) && !defined(__clang__) && !defined(__INTEL_COMPILER)
#define EIGEN_FLATTEN_ATTRIB __attribute__((flatten)) #define EIGEN_FLATTEN_ATTRIB __attribute__((flatten))
#else #else
#define EIGEN_FLATTEN_ATTRIB #define EIGEN_FLATTEN_ATTRIB
#endif #endif
// EIGEN_FORCE_INLINE means "inline as much as possible" // EIGEN_FORCE_INLINE means "inline as much as possible"
#if (defined _MSC_VER) || (defined __intel_compiler) #if (defined _MSC_VER) || (defined __INTEL_COMPILER)
#define EIGEN_STRONG_INLINE __forceinline #define EIGEN_STRONG_INLINE __forceinline
#else #else
#define EIGEN_STRONG_INLINE inline #define EIGEN_STRONG_INLINE inline

View File

@ -1,5 +1,5 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning( pop ) #pragma warning( pop )
#elif defined __intel_compiler #elif defined __INTEL_COMPILER
#pragma warning pop #pragma warning pop
#endif #endif