From f576a353638236775ecb4f4e8ba93cb1716fbe2d Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 22 Jan 2021 08:53:44 -0800 Subject: Don't bother checking for std::aligned_alloc --- common/almalloc.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'common/almalloc.cpp') diff --git a/common/almalloc.cpp b/common/almalloc.cpp index 4d7ff62c..ad1dc6be 100644 --- a/common/almalloc.cpp +++ b/common/almalloc.cpp @@ -18,10 +18,7 @@ void *al_malloc(size_t alignment, size_t size) assert((alignment & (alignment-1)) == 0); alignment = std::max(alignment, alignof(std::max_align_t)); -#if defined(HAVE_STD_ALIGNED_ALLOC) - size = (size+(alignment-1))&~(alignment-1); - return std::aligned_alloc(alignment, size); -#elif defined(HAVE_POSIX_MEMALIGN) +#if defined(HAVE_POSIX_MEMALIGN) void *ret{}; if(posix_memalign(&ret, alignment, size) == 0) return ret; @@ -53,7 +50,7 @@ void *al_calloc(size_t alignment, size_t size) void al_free(void *ptr) noexcept { -#if defined(HAVE_STD_ALIGNED_ALLOC) || defined(HAVE_POSIX_MEMALIGN) +#if defined(HAVE_POSIX_MEMALIGN) std::free(ptr); #elif defined(HAVE__ALIGNED_MALLOC) _aligned_free(ptr); -- cgit v1.2.3