migrate away from aligned_storage

arvidn · Jan 14, 2024 · 4ddeeb6 · 4ddeeb6
1 parent 8b71ce6
commit 4ddeeb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/libtorrent/aux_/aligned_storage.hpp b/include/libtorrent/aux_/aligned_storage.hpp
@@ -38,9 +38,10 @@ POSSIBILITY OF SUCH DAMAGE.
 
 namespace libtorrent { namespace aux {
 
-#if defined __GNUC__ && __GNUC__ < 5 && !defined(_LIBCPP_VERSION)
+#if __cplusplus >= 202302L || defined __GNUC__ && __GNUC__ < 5 && !defined(_LIBCPP_VERSION)
 
 // this is for backwards compatibility with not-quite C++11 compilers
+// and for C++23 which deprecated std::aligned_storage
 template <std::size_t Len, std::size_t Align = alignof(void*)>
 struct aligned_storage
 {

diff --git a/include/libtorrent/aux_/aligned_union.hpp b/include/libtorrent/aux_/aligned_union.hpp
@@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 namespace libtorrent { namespace aux {
 
-#if defined __GNUC__ && __GNUC__ < 5 && !defined(_LIBCPP_VERSION)
+#if __cplusplus >= 202302L || defined __GNUC__ && __GNUC__ < 5 && !defined(_LIBCPP_VERSION)
 
 constexpr std::size_t max(std::size_t a)
 { return a; }
@@ -51,6 +51,7 @@ constexpr std::size_t max(std::size_t a, std::size_t b, Vals... v)
 { return max(a, max(b, v...)); }
 
 // this is for backwards compatibility with not-quite C++11 compilers
+// and for C++23 which deprecated std::aligned_union
 template <std::size_t Len, typename... Types>
 struct aligned_union
 {