From 4361cb8913107de67585fcfe0f57e2ea5daf6ae0 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Sat, 10 Jan 2009 14:24:55 +0000 Subject: [PATCH] EIGEN_NO_MALLOC must also block traditional unaligned malloc --- Eigen/src/Core/util/Memory.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index 37763c44d..bfe342da1 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -109,6 +109,10 @@ template inline void* ei_conditional_aligned_malloc(size_t size) template<> inline void* ei_conditional_aligned_malloc(size_t size) { + #ifdef EIGEN_NO_MALLOC + ei_assert(false && "heap allocation is forbidden (EIGEN_NO_MALLOC is defined)"); + #endif + void *void_result = malloc(size); #ifdef EIGEN_EXCEPTIONS if(!void_result) throw std::bad_alloc();