diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index 89b2fff00..5a2f07cf0 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -785,14 +785,14 @@ EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void* eigen_aligned_alloca_helper(void* pt #define EIGEN_ALIGNED_ALLOCA(SIZE) EIGEN_ALLOCA(SIZE) #endif -#define ei_declare_aligned_stack_constructed_variable(TYPE, NAME, SIZE, BUFFER) \ - Eigen::internal::check_size_for_overflow(SIZE); \ - TYPE* NAME = (BUFFER) != 0 ? (BUFFER) \ - : reinterpret_cast((sizeof(TYPE) * SIZE <= EIGEN_STACK_ALLOCATION_LIMIT) \ - ? EIGEN_ALIGNED_ALLOCA(sizeof(TYPE) * SIZE) \ - : Eigen::internal::aligned_malloc(sizeof(TYPE) * SIZE)); \ - Eigen::internal::aligned_stack_memory_handler EIGEN_CAT(NAME, _stack_memory_destructor)( \ - (BUFFER) == 0 ? NAME : 0, SIZE, sizeof(TYPE) * SIZE > EIGEN_STACK_ALLOCATION_LIMIT) +#define ei_declare_aligned_stack_constructed_variable(TYPE, NAME, SIZE, BUFFER) \ + Eigen::internal::check_size_for_overflow(SIZE); \ + TYPE* NAME = (BUFFER) != 0 ? (BUFFER) \ + : reinterpret_cast((sizeof(TYPE) * (SIZE) <= EIGEN_STACK_ALLOCATION_LIMIT) \ + ? EIGEN_ALIGNED_ALLOCA(sizeof(TYPE) * (SIZE)) \ + : Eigen::internal::aligned_malloc(sizeof(TYPE) * (SIZE))); \ + Eigen::internal::aligned_stack_memory_handler EIGEN_CAT(NAME, _stack_memory_destructor)( \ + (BUFFER) == 0 ? NAME : 0, SIZE, sizeof(TYPE) * (SIZE) > EIGEN_STACK_ALLOCATION_LIMIT) #define ei_declare_local_nested_eval(XPR_T, XPR, N, NAME) \ Eigen::internal::local_nested_eval_wrapper EIGEN_CAT(NAME, _wrapper)( \ @@ -805,10 +805,11 @@ EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void* eigen_aligned_alloca_helper(void* pt #else -#define ei_declare_aligned_stack_constructed_variable(TYPE, NAME, SIZE, BUFFER) \ - Eigen::internal::check_size_for_overflow(SIZE); \ - TYPE* NAME = (BUFFER) != 0 ? BUFFER : reinterpret_cast(Eigen::internal::aligned_malloc(sizeof(TYPE) * SIZE)); \ - Eigen::internal::aligned_stack_memory_handler EIGEN_CAT(NAME, _stack_memory_destructor)( \ +#define ei_declare_aligned_stack_constructed_variable(TYPE, NAME, SIZE, BUFFER) \ + Eigen::internal::check_size_for_overflow(SIZE); \ + TYPE* NAME = \ + (BUFFER) != 0 ? BUFFER : reinterpret_cast(Eigen::internal::aligned_malloc(sizeof(TYPE) * (SIZE))); \ + Eigen::internal::aligned_stack_memory_handler EIGEN_CAT(NAME, _stack_memory_destructor)( \ (BUFFER) == 0 ? NAME : 0, SIZE, true) #define ei_declare_local_nested_eval(XPR_T, XPR, N, NAME) \