Skip to content

Commit 41812e6

Browse files
authored
Merge pull request #255 from costashatz/fix_old_gcc_clang
Fix compilation (veg/memory) for gcc 7 and clang 7
2 parents 24e9b4c + 61a12cf commit 41812e6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ aligned_alloc(usize align, usize size) noexcept -> void*
165165
#if defined(_WIN32)
166166
return _aligned_malloc((size + mask) & ~mask, align);
167167
#elif defined(__APPLE__)
168-
#ifdef PROXSUITE_WITH_CPP_17
168+
#if defined(PROXSUITE_WITH_CPP_17) && defined(_LIBCPP_HAS_ALIGNED_ALLOC)
169169
return alignment::aligned_alloc(align, (size + mask) & ~mask);
170170
#else
171171
return alignment::detail::aligned_alloc(align, (size + mask) & ~mask);
172172
#endif
173173
#else
174-
#ifdef PROXSUITE_WITH_CPP_17
174+
#if defined(PROXSUITE_WITH_CPP_17) && defined(_LIBCPP_HAS_ALIGNED_ALLOC)
175175
return std::aligned_alloc(align, (size + mask) & ~mask);
176176
#else
177177
return alignment::detail::aligned_alloc(align, (size + mask) & ~mask);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
#if VEG_HAS_BUILTIN(__builtin_launder) || __GNUC__ >= 7
4343
#define VEG_LAUNDER(p) (__builtin_launder(p))
44-
#elif defined(VEG_WITH_CXX17_SUPPORT)
44+
#elif defined(VEG_WITH_CXX17_SUPPORT) && __GNUC__ >= 6
4545
#include <new>
4646
#define VEG_LAUNDER(p) (::std::launder(p))
4747
#else

0 commit comments

Comments
 (0)