Skip to content

Commit 7ee3080

Browse files
fabinschjcarpent
authored andcommitted
alloc: fix macos c++14
1 parent c76e297 commit 7ee3080

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

include/proxsuite/linalg/veg/memory/alloc.hpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ namespace veg {
2828
namespace alignment {
2929

3030
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500 && \
31-
(defined(_LIBCPP_HAS_ALIGNED_ALLOC) || defined(_LIBCPP_HAS_C11_FEATURES))
31+
(defined(_LIBCPP_HAS_ALIGNED_ALLOC) || defined(_LIBCPP_HAS_C11_FEATURES)) && \
32+
defined(PROXSUITE_WITH_CPP_17)
3233
VEG_INLINE void*
3334
aligned_alloc(std::size_t alignment, std::size_t size)
3435
{
@@ -167,11 +168,15 @@ aligned_alloc(usize align, usize size) noexcept -> void*
167168
#if defined(_WIN32)
168169
return _aligned_malloc((size + mask) & ~mask, align);
169170
#elif defined(__APPLE__)
171+
#if defined(PROXSUITE_WITH_CPP_17)
170172
return alignment::aligned_alloc(align, (size + mask) & ~mask);
173+
#elif defined(PROXSUITE_WITH_CPP_14)
174+
return alignment::detail::aligned_alloc(align, (size + mask) & ~mask);
175+
#endif
171176
#else
172177
#ifdef PROXSUITE_WITH_CPP_17
173178
return std::aligned_alloc(align, (size + mask) & ~mask);
174-
#else
179+
#elif defined(PROXSUITE_WITH_CPP_14)
175180
return alignment::detail::aligned_alloc(align, (size + mask) & ~mask);
176181
#endif
177182
#endif

0 commit comments

Comments
 (0)