aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-01-09 20:57:06 +0000
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-01-09 20:57:06 +0000
commitb3d580dec7af716e4e384dae0f7bb5c05278a0a1 (patch)
tree68e1da73f984baea6874ec9ceea064e5c7c58670
parentfd831d5a12efd0e2087e71f6da1389a5685c19b8 (diff)
ei_aligned_delete was running through the various paths in the wrong
order
-rw-r--r--Eigen/src/Core/util/Memory.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h
index 15bdb1b5b..4a60da58b 100644
--- a/Eigen/src/Core/util/Memory.h
+++ b/Eigen/src/Core/util/Memory.h
@@ -136,14 +136,14 @@ template<typename T, bool Align> inline T* ei_conditional_aligned_new(size_t siz
*/
inline void ei_aligned_free(void *ptr)
{
- #if EIGEN_HAS_POSIX_MEMALIGN
+ #if EIGEN_MALLOC_ALREADY_ALIGNED
free(ptr);
- #elif EIGEN_MALLOC_ALREADY_ALIGNED
+ #elif EIGEN_HAS_POSIX_MEMALIGN
free(ptr);
- #elif defined(_MSC_VER)
- _aligned_free(ptr);
#elif EIGEN_HAS_MM_MALLOC
_mm_free(ptr);
+ #elif defined(_MSC_VER)
+ _aligned_free(ptr);
#else
ei_handmade_aligned_free(ptr);
#endif