From 665371e6daa58db97f638108eb506be097ff82ca Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Thu, 1 Jan 2026 18:19:10 +0200
Subject: [PATCH] Check __cpp_aligned_new in test/helpers/pmr.hpp before using
 std::align_val_t

---
 test/helpers/pmr.hpp | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/test/helpers/pmr.hpp b/test/helpers/pmr.hpp
index cfa10dce..6b8fe6df 100644
--- a/test/helpers/pmr.hpp
+++ b/test/helpers/pmr.hpp
@@ -11,6 +11,7 @@
 #ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
 
 #include <memory_resource>
+#include <new>
 
 namespace test {
   class counted_new_delete_resource : public std::pmr::memory_resource
@@ -25,17 +26,45 @@ namespace test {
     void* do_allocate(std::size_t bytes, std::size_t alignment) override
     {
       _count += bytes;
+
+#if defined(__cpp_aligned_new) && __cpp_aligned_new >= 201606L
+
       return ::operator new(bytes, std::align_val_t(alignment));
+
+#else
+
+      return ::operator new(bytes);
+      (void)alignment;
+
+#endif
     }
 
     void do_deallocate(
       void* p, std::size_t bytes, std::size_t alignment) override
     {
       _count -= bytes;
-#if __cpp_sized_deallocation
+
+#if defined(__cpp_aligned_new) && __cpp_aligned_new >= 201606L
+# if defined(__cpp_sized_deallocation) && __cpp_sized_deallocation >= 201309L
+
       ::operator delete(p, bytes, std::align_val_t(alignment));
-#else
+
+# else
+
       ::operator delete(p, std::align_val_t(alignment));
+
+# endif
+#else
+# if defined(__cpp_sized_deallocation) && __cpp_sized_deallocation >= 201309L
+
+      ::operator delete(p, bytes);
+
+# else
+
+      ::operator delete(p);
+      (void)alignment;
+
+# endif
 #endif
     }