LWG4141 Improve prohibitions on "additional storage"

Author: burblebee

source/utilities.tex

@@ -3342,8 +3342,7 @@
 Any instance of \tcode{optional<T>} at any given time either contains a value or does not contain a value.
 When an instance of \tcode{optional<T>} \defnx{contains a value}{contains a value!\idxcode{optional}},
 it means that an object of type \tcode{T}, referred to as the optional object's \defnx{contained value}{contained value!\idxcode{optional}},
-is allocated within the storage of the optional object.
-Implementations are not permitted to use additional storage, such as dynamic memory, to allocate its contained value.
+is nested within\iref{intro.object} the optional object.
 When an object of type \tcode{optional<T>} is contextually converted to \tcode{bool},
 the conversion returns \tcode{true} if the object contains a value;
 otherwise the conversion returns \tcode{false}.
@@ -5144,10 +5143,9 @@
 of one of its alternative types or holds no value.
 When an instance of \tcode{variant} holds a value of alternative type \tcode{T},
 it means that a value of type \tcode{T}, referred to as the \tcode{variant}
-object's \defnx{contained value}{contained value!\idxcode{variant}}, is allocated within the storage of the
+object's \defnx{contained value}{contained value!\idxcode{variant}},
+is nested within\iref{intro.object} the
 \tcode{variant} object.
-Implementations are not permitted to use additional storage, such as dynamic
-memory, to allocate the contained value.
 
 \pnum
 All types in \tcode{Types} shall meet
@@ -7539,10 +7537,8 @@
 \pnum
 Any object of type \tcode{expected<T, E>} either
 contains a value of type \tcode{T} or
-a value of type \tcode{E} within its own storage.
-Implementations are not permitted to use additional storage,
-such as dynamic memory,
-to allocate the object of type \tcode{T} or the object of type \tcode{E}.
+a value of type \tcode{E}
+nested within\iref{intro.object} it.
 Member \exposid{has_val} indicates whether the \tcode{expected<T, E>} object
 contains an object of type \tcode{T}.
 
@@ -8925,9 +8921,8 @@
 \pnum
 Any object of type \tcode{expected<T, E>} either
 represents a value of type \tcode{T}, or
-contains a value of type \tcode{E} within its own storage.
-Implementations are not permitted to use additional storage,
-such as dynamic memory, to allocate the object of type \tcode{E}.
+contains a value of type \tcode{E}
+nested within\iref{intro.object} it.
 Member \exposid{has_val} indicates whether the \tcode{expected<T, E>} object
 represents a value of type \tcode{T}.