aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Armin Berres <armin@space-based.de>2009-01-06 11:20:36 +0000
committerGravatar Armin Berres <armin@space-based.de>2009-01-06 11:20:36 +0000
commit8e888a45d09f02016f04c11642aa59ebf04d8701 (patch)
tree1a0b6e56f4447f0588613bcfacd8291082c323e4
parent6736e52d2552750c7346c67e6154e7169528af2a (diff)
call methods from the eigen namespace with prepended Eigen:: in define
-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 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<Eigen_ByteAlignedAsNeeded>(size); \
+ return Eigen::ei_aligned_malloc<Eigen_ByteAlignedAsNeeded>(size); \
} \
void *operator new(size_t, void *ptr) throw() { \
return ptr; \
} \
void *operator new[](size_t size) throw() { \
- return ei_aligned_malloc<Eigen_ByteAlignedAsNeeded>(size); \
+ return Eigen::ei_aligned_malloc<Eigen_ByteAlignedAsNeeded>(size); \
} \
void *operator new[](size_t, void *ptr) throw() { \
return ptr; \
} \
- void operator delete(void * ptr) { ei_aligned_free(static_cast<Eigen_ByteAlignedAsNeeded *>(ptr), 0); } \
- void operator delete[](void * ptr) { ei_aligned_free(static_cast<Eigen_ByteAlignedAsNeeded *>(ptr), 0); }
+ void operator delete(void * ptr) { Eigen::ei_aligned_free(static_cast<Eigen_ByteAlignedAsNeeded *>(ptr), 0); } \
+ void operator delete[](void * ptr) { Eigen::ei_aligned_free(static_cast<Eigen_ByteAlignedAsNeeded *>(ptr), 0); }
#define EIGEN_MAKE_ALIGNED_OPERATOR_NEW \
EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF__INTERNAL(true, )
#define EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF(NeedsToAlign)\