diff --git a/source/containers.tex b/source/containers.tex index b891a886c0..61f5049ae8 100644 --- a/source/containers.tex +++ b/source/containers.tex @@ -6841,8 +6841,8 @@ implementation-specific optimizations. \end{note} If the size is equal to the old capacity, or -if an exception is thrown other than by the move constructor -of a non-\oldconcept{CopyInsertable} \tcode{T}, +if an exception is thrown other than by +the move-construction of one object of non-\oldconcept{CopyInsertable} type \tcode{T} from another, then there are no effects. \pnum @@ -6908,16 +6908,14 @@ \pnum \remarks -If an exception is thrown other than by the -copy constructor, move constructor, -assignment operator, or move assignment operator of -\tcode{T}, +If an exception is thrown other than by +the construction or assignment of one object of type \tcode{T} from another, there are no effects. If an exception is thrown while inserting a single element at either end, there are no effects. -Otherwise, if an exception is thrown by the move constructor of a -non-\oldconcept{CopyInsertable} -\tcode{T}, the effects are unspecified. +Otherwise, if an exception is thrown by +the move-construction of one object of non-\oldconcept{CopyInsertable} type \tcode{T} from another, +the effects are unspecified. \end{itemdescr} \indexlibrarymember{erase}{deque}% @@ -6943,8 +6941,8 @@ \pnum \throws -Nothing unless an exception is thrown by the assignment operator of -\tcode{T}. +Nothing unless an exception is thrown by +the assignment of one object of type \tcode{T} from another. \pnum \complexity @@ -8966,8 +8964,8 @@ otherwise. Reallocation happens at this point if and only if the current capacity is less than the argument of -\tcode{reserve()}. If an exception is thrown -other than by the move constructor of a non-\oldconcept{CopyInsertable} type, +\tcode{reserve()}. If an exception is thrown other than by +the move-construction of one object of non-\oldconcept{CopyInsertable} type \tcode{T} from another, there are no effects. \pnum @@ -9017,8 +9015,9 @@ \end{note} It does not increase \tcode{capacity()}, but may reduce \tcode{capacity()} by causing reallocation. -If an exception is thrown other than by the move constructor -of a non-\oldconcept{CopyInsertable} \tcode{T}, there are no effects. +If an exception is thrown other than by +the move-construction of one object of non-\oldconcept{CopyInsertable} type \tcode{T} from another, +there are no effects. \pnum \complexity @@ -9074,8 +9073,9 @@ \pnum \remarks -If an exception is thrown other than by the move constructor of a non-\oldconcept{CopyInsertable} -\tcode{T}, there are no effects. +If an exception is thrown other than by +the move-construction of one object of non-\oldconcept{CopyInsertable} type \tcode{T} from another, +there are no effects. \end{itemdescr} \indexlibrarymember{resize}{vector}% @@ -9161,15 +9161,15 @@ including the past-the-end iterator, are invalidated. If an exception is thrown other than by -the copy constructor, move constructor, -assignment operator, or move assignment operator of -\tcode{T} or by any \tcode{InputIterator} operation, +the construction or assignment of one object of type \tcode{T} from another, +or by any \tcode{InputIterator} operation, there are no effects. If an exception is thrown while inserting a single element at the end and \tcode{T} is \oldconcept{CopyInsertable} or \tcode{is_nothrow_move_constructible_v} is \tcode{true}, there are no effects. -Otherwise, if an exception is thrown by the move constructor of a non-\oldconcept{CopyInsertable} -\tcode{T}, the effects are unspecified. +Otherwise, if an exception is thrown by +the move-construction of one object of non-\oldconcept{CopyInsertable} type \tcode{T} from another, +the effects are unspecified. \end{itemdescr} \indexlibrarymember{erase}{vector}% @@ -9186,9 +9186,8 @@ \pnum \throws -Nothing unless an exception is thrown by the -assignment operator or move assignment operator of -\tcode{T}. +Nothing unless an exception is thrown by +the construction or assignment of one object of type \tcode{T} from another. \pnum \complexity @@ -9893,13 +9892,9 @@ \pnum \remarks -If an exception is thrown other than by the -copy constructor, -move constructor, -assignment operator, or -move assignment operator -of \tcode{T} or by -any \tcode{InputIterator} operation, +If an exception is thrown other than by +the construction or assignment of one object of type \tcode{T} from another, +or by any \tcode{InputIterator} operation, there are no effects. Otherwise, if an exception is thrown, then @@ -10097,7 +10092,7 @@ \pnum \throws Nothing unless an exception is thrown by -the assignment operator or move assignment operator of \tcode{T}. +the assignment of one object of type \tcode{T} from another. \pnum \complexity