diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2009-01-10 14:10:40 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2009-01-10 14:10:40 +0000 |
| commit | 50ad8b901053c08519663c0f0310fe9c70365e9f (patch) | |
| tree | 8a9b3aa5f236cc5ff24a3573fc07427895081b68 /Eigen | |
| parent | 0c1ef2f4c67430e3c6605adfb1ddc3ac1d1e779f (diff) | |
fix potential compilation issue on MSVC + no vectorization
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/Core | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Eigen/Core b/Eigen/Core index d4626cfa3..7f42a6c29 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -3,7 +3,9 @@ // first thing Eigen does: prevent MSVC from committing suicide #include "src/Core/util/DisableMSVCWarnings.h" + #ifdef _MSC_VER + #include <malloc.h> // 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 @@ -59,10 +61,6 @@ #include <string> #include <limits> -#if defined(EIGEN_SSE2_ON_MSVC_2008_OR_LATER) && defined(EIGEN_VECTORIZE) - #include <malloc.h> // for _aligned_malloc -#endif - #if (defined(_CPPUNWIND) || defined(__EXCEPTIONS)) && !defined(EIGEN_NO_EXCEPTIONS) #define EIGEN_EXCEPTIONS #endif |