From 135013c608cc418ecd201f59334fbd5523b3b664 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Thu, 4 Mar 2010 16:38:37 +0100 Subject: [PATCH] EIGEN_ALIGN std:: fixup --- Eigen/src/Core/util/Memory.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index b0165f9fd..5587cfb50 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -85,9 +85,9 @@ inline void* ei_aligned_malloc(size_t size) void *result; #if !EIGEN_ALIGN - result = malloc(size); + result = std::malloc(size); #elif EIGEN_MALLOC_ALREADY_ALIGNED - result = malloc(size); + result = std::malloc(size); #elif EIGEN_HAS_POSIX_MEMALIGN if(posix_memalign(&result, 16, size)) result = 0; #elif EIGEN_HAS_MM_MALLOC @@ -156,11 +156,11 @@ template inline T* ei_conditional_aligned_new(size_t siz inline void ei_aligned_free(void *ptr) { #if !EIGEN_ALIGN - free(ptr); + std::free(ptr); #elif EIGEN_MALLOC_ALREADY_ALIGNED - free(ptr); + std::free(ptr); #elif EIGEN_HAS_POSIX_MEMALIGN - free(ptr); + std::free(ptr); #elif EIGEN_HAS_MM_MALLOC _mm_free(ptr); #elif defined(_MSC_VER)