Merge pull request #284 from black-sat/fix/aligned_storage

Remove usage of `std::aligned_storage` to switch off deprecation warnings in C++23
arximboldi · May 1, 2024 · bd9f318 · bd9f318
2 parents 00cdcbf + 69efb28
commit bd9f318
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/immer/detail/util.hpp b/immer/detail/util.hpp
@@ -36,9 +36,20 @@ const T& as_const(T& x)
     return x;
 }
 
+template<std::size_t Size, std::size_t Align>
+struct aligned_storage
+{
+    struct type {
+        alignas(Align) unsigned char data[Size];
+    };
+};
+
+template<std::size_t Size, std::size_t Align>
+using aligned_storage_t = typename aligned_storage<Size, Align>::type;
+
 template <typename T>
 using aligned_storage_for =
-    typename std::aligned_storage<sizeof(T), alignof(T)>::type;
+    typename aligned_storage<sizeof(T), alignof(T)>::type;
 
 template <typename T>
 T& auto_const_cast(const T& x)

diff --git a/immer/heap/debug_size_heap.hpp b/immer/heap/debug_size_heap.hpp
@@ -10,6 +10,7 @@
 
 #include <immer/config.hpp>
 #include <immer/heap/identity_heap.hpp>
+#include <immer/detail/util.hpp>
 
 #include <cassert>
 #include <cstddef>
@@ -39,7 +40,10 @@ struct debug_size_heap
     constexpr static auto extra_size = 8;
 #else
     constexpr static auto extra_size = sizeof(
-        std::aligned_storage_t<sizeof(std::size_t), alignof(std::max_align_t)>);
+        detail::aligned_storage_t<
+            sizeof(std::size_t), alignof(std::max_align_t)
+        >
+    );
 #endif
 
     template <typename... Tags>