[unique.ptr.single] Rephrase destruction

Author: jensmaurer

source/utilities.tex

@@ -11525,17 +11525,17 @@
 
 \begin{itemdescr}
 \pnum
-\expects
-The expression \tcode{get_deleter()(get())} is well-formed,
-has well-defined behavior, and does not throw exceptions.
+\effects
+Equivalent to:
+\tcode{if (get()) get_deleter()(get());}
 \begin{note}
 The use of \tcode{default_delete} requires \tcode{T} to be a complete type.
 \end{note}
 
 \pnum
-\effects
-If \tcode{get() == nullptr} there are no effects.
-Otherwise \tcode{get_deleter()(get())}.
+\remarks
+The behavior is undefined
+if the evaluation of \tcode{get_deleter()(get())} throws an exception.
 \end{itemdescr}
 
 \rSec4[unique.ptr.single.asgn]{Assignment}
@@ -11728,16 +11728,11 @@
 \end{itemdecl}
 
 \begin{itemdescr}
-\pnum
-\expects
-The expression \tcode{get_deleter()(get())} is well-formed,
-has well-defined behavior, and does not throw exceptions.
-
 \pnum
 \effects
-Assigns \tcode{p} to the stored pointer, and then if and only if the old value of the
-stored pointer, \tcode{old_p}, was not equal to \keyword{nullptr}, calls
-\tcode{get_deleter()(old_p)}.
+Assigns \tcode{p} to the stored pointer, and then,
+with the old value of the stored pointer, \tcode{old_p},
+evaluates \tcode{if (old_p) get_deleter()(old_p);}
 \begin{note}
 The order of these operations is significant
 because the call to \tcode{get_deleter()} might destroy \tcode{*this}.
@@ -11750,6 +11745,11 @@
 The postcondition does not hold if the call to \tcode{get_deleter()}
 destroys \tcode{*this} since \tcode{this->get()} is no longer a valid expression.
 \end{note}
+
+\pnum
+\remarks
+The behavior is undefined
+if the evaluation of \tcode{get_deleter()(old_p)} throws an exception.
 \end{itemdescr}
 
 \indexlibrarymember{swap}{unique_ptr}%