Merge 2019-11 LWG Motion 30

P1723R2 Mandating the Standard Library: Clause 31 - Atomics library

Author: zygoloid

source/atomics.tex

@@ -743,8 +743,7 @@
 the object referenced by \tcode{*ptr} is an atomic object\iref{intro.races}.
 
 \pnum
-The template argument for \tcode{T}
-shall be trivially copyable\iref{basic.types}.
+The program is ill-formed if \tcode{is_trivially_copyable_v<T>} is \tcode{false}.
 
 \pnum
 The lifetime\iref{basic.life} of an object referenced by \tcode{*ptr}
@@ -836,11 +835,12 @@
 
 \begin{itemdescr}
 \pnum
-\requires The referenced object shall be aligned to \tcode{required_alignment}.
+\expects
+The referenced object is aligned to \tcode{required_alignment}.
 
 \pnum
-\effects
-Constructs an atomic reference that references the object.
+\ensures
+\tcode{*this} references \tcode{obj}.
 
 \pnum
 \throws
@@ -857,9 +857,8 @@
 
 \begin{itemdescr}
 \pnum
-\effects
-Constructs an atomic reference
-that references the object referenced by \tcode{ref}.
+\ensures
+\tcode{*this} references the object referenced by \tcode{ref}.
 \end{itemdescr}
 
 \indexlibrarymember{store}{atomic_ref}%
@@ -872,7 +871,8 @@
 
 \begin{itemdescr}
 \pnum
-\requires The \tcode{order} argument shall not be
+\expects
+The \tcode{order} argument is neither
 \tcode{memory_order_consume},
 \tcode{memory_order_acquire}, nor
 \tcode{memory_order_acq_rel}.
@@ -912,7 +912,8 @@
 
 \begin{itemdescr}
 \pnum
-\requires The \tcode{order} argument shall not be
+\expects
+The \tcode{order} argument is neither
 \tcode{memory_order_release} nor \tcode{memory_order_acq_rel}.
 
 \pnum
@@ -984,7 +985,8 @@
 
 \begin{itemdescr}
 \pnum
-\requires The \tcode{failure} argument shall not be
+\expects
+The \tcode{failure} argument is neither
 \tcode{memory_order_release} nor \tcode{memory_order_acq_rel}.
 
 \pnum
@@ -1443,8 +1445,8 @@
 
 \begin{itemdescr}
 \pnum
-\requires \tcode{T} shall be an object type,
-otherwise the program is ill-formed.
+\mandates
+\tcode{T} is a complete object type.
 
 \pnum
 \effects
@@ -1710,7 +1712,8 @@
 
 \begin{itemdescr}
 \pnum
-\requires The \tcode{order} argument shall not be \tcode{memory_order::consume},
+\expects
+The \tcode{order} argument is neither \tcode{memory_order::consume},
 \tcode{memory_order::acquire}, nor \tcode{memory_order::acq_rel}.
 
 \pnum
@@ -1752,7 +1755,8 @@
 
 \begin{itemdescr}
 \pnum
-\requires The \tcode{order} argument shall not be \tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
+\expects
+The \tcode{order} argument is neither \tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
 
 \pnum
 \effects
@@ -1836,7 +1840,8 @@
 
 \begin{itemdescr}
 \pnum
-\requires The \tcode{failure} argument shall not be \tcode{memory_order::release} nor
+\expects
+The \tcode{failure} argument is neither \tcode{memory_order::release} nor
 \tcode{memory_order::acq_rel}.
 
 \pnum
@@ -2539,7 +2544,8 @@
 
 \begin{itemdescr}
 \pnum
-\requires T shall be an object type, otherwise the program is ill-formed.
+\mandates
+\tcode{T} is a complete object type.
 \begin{note}
 Pointer arithmetic on \tcode{void*} or function pointers is ill-formed.
 \end{note}
@@ -3414,7 +3420,8 @@
 
 \begin{itemdescr}
 \pnum
-\requires The \tcode{order} argument shall not be \tcode{memory_order::consume},
+\expects
+The \tcode{order} argument is neither \tcode{memory_order::consume},
 \tcode{memory_order::acquire}, nor \tcode{memory_order::acq_rel}.
 
 \pnum

source/future.tex

@@ -2557,7 +2557,7 @@
 \begin{itemdescr}
 \pnum
 \remarks
-The macro \tcode{ATOMIC_FLAG_INIT} shall be defined in such a way that
+The macro \tcode{ATOMIC_FLAG_INIT} is defined in such a way that
 it can be used to initialize an object of type \tcode{atomic_flag}
 to the clear state.
 The macro can be used in the form: