GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-23 21:34:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

EIGEN_ALIGN std:: fixup

Browse Source
This commit is contained in:
Piotr Trojanek 2010-03-04 16:38:37 +01:00
parent 1625a5e3f8
commit 135013c608
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Eigen/src/Core/util/Memory.h
View File

@ -85,9 +85,9 @@ inline void* ei_aligned_malloc(size_t size)
void *result; void *result;
#if !EIGEN_ALIGN #if !EIGEN_ALIGN
result = malloc(size); result = std::malloc(size);
#elif EIGEN_MALLOC_ALREADY_ALIGNED #elif EIGEN_MALLOC_ALREADY_ALIGNED
result = malloc(size); result = std::malloc(size);
#elif EIGEN_HAS_POSIX_MEMALIGN #elif EIGEN_HAS_POSIX_MEMALIGN
if(posix_memalign(&result, 16, size)) result = 0; if(posix_memalign(&result, 16, size)) result = 0;
#elif EIGEN_HAS_MM_MALLOC #elif EIGEN_HAS_MM_MALLOC
@ -156,11 +156,11 @@ template<typename T, bool Align> inline T* ei_conditional_aligned_new(size_t siz
inline void ei_aligned_free(void *ptr) inline void ei_aligned_free(void *ptr)
{ {
#if !EIGEN_ALIGN #if !EIGEN_ALIGN
free(ptr); std::free(ptr);
#elif EIGEN_MALLOC_ALREADY_ALIGNED #elif EIGEN_MALLOC_ALREADY_ALIGNED
free(ptr); std::free(ptr);
#elif EIGEN_HAS_POSIX_MEMALIGN #elif EIGEN_HAS_POSIX_MEMALIGN
free(ptr); std::free(ptr);
#elif EIGEN_HAS_MM_MALLOC #elif EIGEN_HAS_MM_MALLOC
_mm_free(ptr); _mm_free(ptr);
#elif defined(_MSC_VER) #elif defined(_MSC_VER)