From 807be52a5a7d82fa523c3b8690ee61d83e5ced63 Mon Sep 17 00:00:00 2001
From: Alisdair Meredith <alisdairm@me.com>
Date: Sun, 24 Mar 2024 09:58:33 +0900
Subject: [PATCH] P2869R4 Remove deprecated atomic free function API for
 shared_ptr

Editorial note: the Annex C entry has been revised to not include a
"difficulty of converting" part (which we only use for differences
with C), and instead only state the effects of the removal briefly.
---
 source/compatibility.tex |  12 ++
 source/future.tex        | 268 ---------------------------------------
 source/xrefdelta.tex     |   3 +
 3 files changed, 15 insertions(+), 268 deletions(-)

diff --git a/source/compatibility.tex b/source/compatibility.tex
index 5bc069300b..fa74266152 100644
--- a/source/compatibility.tex
+++ b/source/compatibility.tex
@@ -155,6 +155,18 @@
                                                                         // OK in \CppXXVI{}
 \end{codeblock}
 
+\nodiffref
+\change
+Removal of atomic access API for \tcode{shared_ptr} objects.
+\rationale
+The old behavior was brittle. \tcode{shared_ptr} objects using the old API were
+not protected by the type system, and certain interactions with code not using
+this API would, in some cases, silently produce undefined behavior. A complete
+type-safe replacement is provided in the form of \tcode{atomic<shared_ptr<T>>}.
+\effect
+A valid \CppXXIII{} program that relies on the presence of the removed functions
+may fail to compile.
+
 \nodiffref
 \change
 Remove the \tcode{basic_string::reserve()} overload with no parameters.
diff --git a/source/future.tex b/source/future.tex
index ba51a08f9c..0ed3fc684e 100644
--- a/source/future.tex
+++ b/source/future.tex
@@ -675,274 +675,6 @@
 \tcode{current}.
 \end{itemdescr}
 
-\rSec1[depr.util.smartptr.shared.atomic]{Deprecated \tcode{shared_ptr} atomic access}
-
-\pnum
-The header \libheaderref{memory} has the following additions:
-
-\indexlibraryglobal{shared_ptr}%
-\begin{codeblock}
-namespace std {
-  template<class T>
-    bool atomic_is_lock_free(const shared_ptr<T>* p);
-
-  template<class T>
-    shared_ptr<T> atomic_load(const shared_ptr<T>* p);
-  template<class T>
-    shared_ptr<T> atomic_load_explicit(const shared_ptr<T>* p, memory_order mo);
-
-  template<class T>
-    void atomic_store(shared_ptr<T>* p, shared_ptr<T> r);
-  template<class T>
-    void atomic_store_explicit(shared_ptr<T>* p, shared_ptr<T> r, memory_order mo);
-
-  template<class T>
-    shared_ptr<T> atomic_exchange(shared_ptr<T>* p, shared_ptr<T> r);
-  template<class T>
-    shared_ptr<T> atomic_exchange_explicit(shared_ptr<T>* p, shared_ptr<T> r, memory_order mo);
-
-  template<class T>
-    bool atomic_compare_exchange_weak(shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w);
-  template<class T>
-    bool atomic_compare_exchange_strong(shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w);
-  template<class T>
-    bool atomic_compare_exchange_weak_explicit(
-      shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w,
-      memory_order success, memory_order failure);
-  template<class T>
-    bool atomic_compare_exchange_strong_explicit(
-      shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w,
-      memory_order success, memory_order failure);
-}
-\end{codeblock}
-
-\pnum
-Concurrent access to a \tcode{shared_ptr} object from multiple threads does not
-introduce a data race if the access is done exclusively via the functions in
-this subclause and the instance is passed as their first argument.
-
-\pnum
-The meaning of the arguments of type \tcode{memory_order} is explained in~\ref{atomics.order}.
-
-\indexlibrarymember{atomic_is_lock_free}{shared_ptr}%
-\begin{itemdecl}
-template<class T> bool atomic_is_lock_free(const shared_ptr<T>* p);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\expects
-\tcode{p} is not null.
-
-\pnum
-\returns
-\tcode{true} if atomic access to \tcode{*p} is lock-free, \tcode{false} otherwise.
-
-\pnum
-\throws
-Nothing.
-\end{itemdescr}
-
-\indexlibrarymember{atomic_load}{shared_ptr}%
-\begin{itemdecl}
-template<class T> shared_ptr<T> atomic_load(const shared_ptr<T>* p);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\expects
-\tcode{p} is not null.
-
-\pnum
-\returns
-\tcode{atomic_load_explicit(p, memory_order::seq_cst)}.
-
-\pnum
-\throws
-Nothing.
-\end{itemdescr}
-
-\indexlibrarymember{atomic_load_explicit}{shared_ptr}%
-\begin{itemdecl}
-template<class T> shared_ptr<T> atomic_load_explicit(const shared_ptr<T>* p, memory_order mo);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\expects
-\tcode{p} is not null.
-\tcode{mo} is neither \tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
-
-\pnum
-\returns
-\tcode{*p}.
-
-\pnum
-\throws
-Nothing.
-\end{itemdescr}
-
-\indexlibrarymember{atomic_store}{shared_ptr}%
-\begin{itemdecl}
-template<class T> void atomic_store(shared_ptr<T>* p, shared_ptr<T> r);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\expects
-\tcode{p} is not null.
-
-\pnum
-\effects
-As if by \tcode{atomic_store_explicit(p, r, memory_order::seq_cst)}.
-
-\pnum
-\throws
-Nothing.
-\end{itemdescr}
-
-\indexlibrarymember{atomic_store_explicit}{shared_ptr}%
-\begin{itemdecl}
-template<class T> void atomic_store_explicit(shared_ptr<T>* p, shared_ptr<T> r, memory_order mo);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\expects
-\tcode{p} is not null.
-\tcode{mo} is neither \tcode{memory_order::acquire} nor \tcode{memory_order::acq_rel}.
-
-\pnum
-\effects
-As if by \tcode{p->swap(r)}.
-
-\pnum
-\throws
-Nothing.
-\end{itemdescr}
-
-\indexlibrarymember{atomic_exchange}{shared_ptr}%
-\begin{itemdecl}
-template<class T> shared_ptr<T> atomic_exchange(shared_ptr<T>* p, shared_ptr<T> r);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\expects
-\tcode{p} is not null.
-
-\pnum
-\returns
-\tcode{atomic_exchange_explicit(p, r, memory_order::seq_cst)}.
-
-\pnum
-\throws
-Nothing.
-\end{itemdescr}
-
-\indexlibrarymember{atomic_exchange_explicit}{shared_ptr}%
-\begin{itemdecl}
-template<class T>
-  shared_ptr<T> atomic_exchange_explicit(shared_ptr<T>* p, shared_ptr<T> r, memory_order mo);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\expects
-\tcode{p} is not null.
-
-\pnum
-\effects
-As if by \tcode{p->swap(r)}.
-
-\pnum
-\returns
-The previous value of \tcode{*p}.
-
-\pnum
-\throws
-Nothing.
-\end{itemdescr}
-
-\indexlibrarymember{atomic_compare_exchange_weak}{shared_ptr}%
-\begin{itemdecl}
-template<class T>
-  bool atomic_compare_exchange_weak(shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\expects
-\tcode{p} is not null and \tcode{v} is not null.
-
-\pnum
-\returns
-\begin{codeblock}
-atomic_compare_exchange_weak_explicit(p, v, w, memory_order::seq_cst, memory_order::seq_cst)
-\end{codeblock}
-
-\pnum
-\throws
-Nothing.
-\end{itemdescr}
-
-\indexlibrarymember{atomic_compare_exchange_strong}{shared_ptr}%
-\begin{itemdecl}
-template<class T>
-  bool atomic_compare_exchange_strong(shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\returns
-\begin{codeblock}
-atomic_compare_exchange_strong_explicit(p, v, w, memory_order::seq_cst,
-                                        memory_order::seq_cst)
-\end{codeblock}
-\end{itemdescr}
-
-\indexlibrarymember{atomic_compare_exchange_weak_explicit}{shared_ptr}%
-\indexlibrarymember{atomic_compare_exchange_strong_explicit}{shared_ptr}%
-\begin{itemdecl}
-template<class T>
-  bool atomic_compare_exchange_weak_explicit(
-    shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w,
-    memory_order success, memory_order failure);
-template<class T>
-  bool atomic_compare_exchange_strong_explicit(
-    shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w,
-    memory_order success, memory_order failure);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\expects
-\tcode{p} is not null and \tcode{v} is not null.
-The \tcode{failure} argument is neither \tcode{memory_order::release} nor
-\tcode{memory_order::acq_rel}.
-
-\pnum
-\effects
-If \tcode{*p} is equivalent to \tcode{*v}, assigns \tcode{w} to
-\tcode{*p} and has synchronization semantics corresponding to the value of
-\tcode{success}, otherwise assigns \tcode{*p} to \tcode{*v} and has
-synchronization semantics corresponding to the value of \tcode{failure}.
-
-\pnum
-\returns
-\tcode{true} if \tcode{*p} was equivalent to \tcode{*v}, \tcode{false} otherwise.
-
-\pnum
-\throws
-Nothing.
-
-\pnum
-\remarks
-Two \tcode{shared_ptr} objects are equivalent if they store the same
-pointer value and share ownership.
-The weak form may fail spuriously. See~\ref{atomics.types.operations}.
-\end{itemdescr}
-
 \rSec1[depr.format]{Deprecated formatting}
 
 \rSec2[depr.format.syn]{Header \tcode{<format>} synopsis}
diff --git a/source/xrefdelta.tex b/source/xrefdelta.tex
index b8eade4847..d3886d7342 100644
--- a/source/xrefdelta.tex
+++ b/source/xrefdelta.tex
@@ -59,6 +59,9 @@
 \removedxref{depr.strstreambuf.members}
 \removedxref{depr.strstreambuf.virtuals}
 
+% P2869R4 Remove deprecated shared_ptr atomic access
+\removedxref{depr.util.smartptr.shared.atomic}
+
 %%% Renamed sections.
 %%% Examples:
 %