diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-02-22 09:32:39 -0500 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-02-22 09:32:39 -0500 |
| commit | 720767ae40552911449d275c664c4c6c0dbf70be (patch) | |
| tree | a1180b3883df7575929b2b5c23858db2be54ffa6 /Eigen/src/Core | |
| parent | d8e97aee8977b8b65acc928192122a753f8582f2 (diff) | |
ICC 12 / linux only defined __INTEL_COMPILER, not __intel_compiler
Diffstat (limited to 'Eigen/src/Core')
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 4 | ||||
| -rw-r--r-- | Eigen/src/Core/util/ReenableStupidWarnings.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index 5088099fb..052868097 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -142,14 +142,14 @@ #define EIGEN_ALWAYS_INLINE_ATTRIB #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)) #else #define EIGEN_FLATTEN_ATTRIB #endif // 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 #else #define EIGEN_STRONG_INLINE inline diff --git a/Eigen/src/Core/util/ReenableStupidWarnings.h b/Eigen/src/Core/util/ReenableStupidWarnings.h index d1164a82c..92d2d95c0 100644 --- a/Eigen/src/Core/util/ReenableStupidWarnings.h +++ b/Eigen/src/Core/util/ReenableStupidWarnings.h @@ -1,5 +1,5 @@ #ifdef _MSC_VER #pragma warning( pop ) -#elif defined __intel_compiler +#elif defined __INTEL_COMPILER #pragma warning pop #endif
\ No newline at end of file |