Merge 2024-03 LWG Motion 2

P2875R4 Undeprecate polymorphic_allocator::destroy

Author: tkoeppe

source/future.tex

@@ -1384,35 +1384,6 @@
 is the same as the value of the \libheader{cerrno} macro
 shown in the above synopsis.
 
-\rSec1[depr.mem.poly.allocator.mem]{Deprecated \tcode{polymorphic_allocator} member function}
-
-\pnum
-The following member is declared in addition to those members
-specified in \ref{mem.poly.allocator.mem}:
-
-\begin{codeblock}
-namespace std::pmr {
-  template<class Tp = byte>
-  class polymorphic_allocator {
-  public:
-    template <class T>
-      void destroy(T* p);
-  };
-}
-\end{codeblock}
-
-\indexlibrarymember{destroy}{polymorphic_allocator}%
-\begin{itemdecl}
-template<class T>
-  void destroy(T* p);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\effects
-As if by \tcode{p->\~T()}.
-\end{itemdescr}
-
 \rSec1[depr.meta.types]{Deprecated type traits}
 
 \pnum

source/memory.tex

@@ -5813,6 +5813,9 @@
     template<class T, class... Args>
       void construct(T* p, Args&&... args);
 
+    template<class T>
+      void destroy(T* p);
+
     polymorphic_allocator select_on_container_copy_construction() const;
 
     memory_resource* resource() const;
@@ -6023,7 +6026,7 @@
 \effects
 Equivalent to:
 \begin{codeblock}
-allocator_traits<polymorphic_allocator>::destroy(*this, p);
+destroy(p);
 deallocate_object(p);
 \end{codeblock}
 \end{itemdescr}
@@ -6053,6 +6056,18 @@
 Nothing unless the constructor for \tcode{T} throws.
 \end{itemdescr}
 
+\indexlibrarymember{destroy}{polymorphic_allocator}%
+\begin{itemdecl}
+template<class T>
+  void destroy(T* p);
+\end{itemdecl}
+
+\begin{itemdescr}
+\pnum
+\effects
+Equivalent to \tcode{p->\~T()}.
+\end{itemdescr}
+
 \indexlibrarymember{select_on_container_copy_construction}{polymorphic_allocator}%
 \begin{itemdecl}
 polymorphic_allocator select_on_container_copy_construction() const;

source/xrefdelta.tex

@@ -48,6 +48,9 @@
 % https://github.com/cplusplus/draft/pull/6255
 \movedxref{container.gen.reqmts}{container.requirements.general}
 
+% P2875 Undeprecate polymorphic_allocator::destroy
+\movedxref{depr.mem.poly.allocator.mem}{mem.poly.allocator.mem}
+
 % https://github.com/cplusplus/draft/pull/6653
 \movedxref{mismatch}{alg.mismatch}