Merge pull request #255 from costashatz/fix_old_gcc_clang

Fix compilation (veg/memory) for gcc 7 and clang 7
Simple-Robotics · Aug 14, 2023 · 41812e6 · 41812e6
2 parents 24e9b4c + 61a12cf
commit 41812e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/proxsuite/linalg/veg/memory/alloc.hpp b/include/proxsuite/linalg/veg/memory/alloc.hpp
@@ -165,13 +165,13 @@ aligned_alloc(usize align, usize size) noexcept -> void*
 #if defined(_WIN32)
   return _aligned_malloc((size + mask) & ~mask, align);
 #elif defined(__APPLE__)
-#ifdef PROXSUITE_WITH_CPP_17
+#if defined(PROXSUITE_WITH_CPP_17) && defined(_LIBCPP_HAS_ALIGNED_ALLOC)
   return alignment::aligned_alloc(align, (size + mask) & ~mask);
 #else
   return alignment::detail::aligned_alloc(align, (size + mask) & ~mask);
 #endif
 #else
-#ifdef PROXSUITE_WITH_CPP_17
+#if defined(PROXSUITE_WITH_CPP_17) && defined(_LIBCPP_HAS_ALIGNED_ALLOC)
   return std::aligned_alloc(align, (size + mask) & ~mask);
 #else
   return alignment::detail::aligned_alloc(align, (size + mask) & ~mask);

diff --git a/include/proxsuite/linalg/veg/memory/placement.hpp b/include/proxsuite/linalg/veg/memory/placement.hpp
@@ -41,7 +41,7 @@
 
 #if VEG_HAS_BUILTIN(__builtin_launder) || __GNUC__ >= 7
 #define VEG_LAUNDER(p) (__builtin_launder(p))
-#elif defined(VEG_WITH_CXX17_SUPPORT)
+#elif defined(VEG_WITH_CXX17_SUPPORT) && __GNUC__ >= 6
 #include <new>
 #define VEG_LAUNDER(p) (::std::launder(p))
 #else