Merge pull request #55 from jcarpent/topic/aligned_alloc

jcarpent · web-flow · commit 8e242a46646f · 2022-10-18T22:55:34.000+02:00
Fix existence of std::aligned_alloc on APPLE
diff --git a/include/proxsuite/linalg/veg/memory/alloc.hpp b/include/proxsuite/linalg/veg/memory/alloc.hpp
@@ -27,7 +27,8 @@ namespace veg {
 #ifdef __APPLE__
 namespace alignment {
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500 &&                                 \
+  (defined(_LIBCPP_HAS_ALIGNED_ALLOC) || defined(_LIBCPP_HAS_C11_FEATURES))
 VEG_INLINE void*
 aligned_alloc(std::size_t alignment, std::size_t size)
 {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ namespace veg {`
`27`	`27`	`#ifdef __APPLE__`
`28`	`28`	`namespace alignment {`
`29`	`29`
`30`		`-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500`
	`30`	`+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500 && \`
	`31`	`+ (defined(_LIBCPP_HAS_ALIGNED_ALLOC) \|\| defined(_LIBCPP_HAS_C11_FEATURES))`
`31`	`32`	`VEG_INLINE void*`
`32`	`33`	`aligned_alloc(std::size_t alignment, std::size_t size)`
`33`	`34`	`{`