Merge branch 'mac_support'

2 files changed, 8 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a9f3d1..31e5ff4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,11 +8,7 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif()
 
-if(APPLE)
-  set(CMAKE_CXX_STANDARD 17) # aligned_alloc doesn't work otherwise
-else(APPLE)
-  set(CMAKE_CXX_STANDARD 11)
-endif(APPLE)
+set(CMAKE_CXX_STANDARD 11)
 
 # Check if compiler supports AVX512
 try_compile(INTGEMM_COMPILER_SUPPORTS_AVX512
diff --git a/aligned.h b/aligned.h
index b5512ba..6e72afb 100644
--- a/aligned.h
+++ b/aligned.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <cstdlib>
-#include <algorithm>
+#include <stdlib.h>
 
 // 64-byte aligned simple vector.
 
@@ -9,7 +9,12 @@ namespace intgemm {
 template <class T> class AlignedVector {
   public:
     explicit AlignedVector(std::size_t size)
-      : mem_(static_cast<T*>(aligned_alloc(64, (size * sizeof(T) + 63) & ~63))), size_(size) {
+      : size_(size) {
+     #ifdef __APPLE__
+      posix_memalign(reinterpret_cast<void **>(&mem_), 64, size * sizeof(T));
+     #else
+      mem_ = reinterpret_cast<T*>(aligned_alloc(64, (size * sizeof(T) + 63) & ~63)); // pedantic requirements for memory size on aligned_alloc in case it's not just a call to posix_memalign
+     #endif
     }
 
     AlignedVector(const AlignedVector&) = delete;