From 8e888a45d09f02016f04c11642aa59ebf04d8701 Mon Sep 17 00:00:00 2001 From: Armin Berres Date: Tue, 6 Jan 2009 11:20:36 +0000 Subject: call methods from the eigen namespace with prepended Eigen:: in define --- Eigen/src/Core/util/Memory.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index 12cb5a837..f6e2dcb32 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -150,19 +150,19 @@ inline static int ei_alignmentOffset(const Scalar* ptr, int maxOffset) char \ >::ret Eigen_ByteAlignedAsNeeded; \ void *operator new(size_t size) throw() { \ - return ei_aligned_malloc(size); \ + return Eigen::ei_aligned_malloc(size); \ } \ void *operator new(size_t, void *ptr) throw() { \ return ptr; \ } \ void *operator new[](size_t size) throw() { \ - return ei_aligned_malloc(size); \ + return Eigen::ei_aligned_malloc(size); \ } \ void *operator new[](size_t, void *ptr) throw() { \ return ptr; \ } \ - void operator delete(void * ptr) { ei_aligned_free(static_cast(ptr), 0); } \ - void operator delete[](void * ptr) { ei_aligned_free(static_cast(ptr), 0); } + void operator delete(void * ptr) { Eigen::ei_aligned_free(static_cast(ptr), 0); } \ + void operator delete[](void * ptr) { Eigen::ei_aligned_free(static_cast(ptr), 0); } #define EIGEN_MAKE_ALIGNED_OPERATOR_NEW \ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF__INTERNAL(true, ) #define EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF(NeedsToAlign)\ -- cgit v1.2.3