Merge 2016-02 LWG Motion 2

Author: zygoloid

source/containers.tex

@@ -2590,12 +2590,7 @@
 \indextext{\idxcode{array}!initialization}%
 \indextext{\idxcode{array}!as aggregate}%
 An \tcode{array} is an aggregate~(\ref{dcl.init.aggr}) that can be
-initialized with the syntax
-\begin{codeblock}
-array<T, N> a = { @\textit{initializer-list}@ };
-\end{codeblock}
-
-where \textit{initializer-list} is a comma-separated list of up
+list-initialized with up
 to \tcode{N} elements whose types are convertible to \tcode{T}.
 
 \pnum
@@ -3708,9 +3703,7 @@
 \pnum
 \effects If \tcode{sz < distance(begin(), end())}, erases the last \tcode{distance(begin(),
 end()) - sz} elements from the list. Otherwise, inserts \tcode{sz - distance(begin(), end())}  
-elements at the end of the list such that each new element, \tcode{e}, is initialized
-by a method equivalent to calling
-\tcode{allocator_traits<allocator_type>::construct(get_allocator(), std::addressof(e), c)}.
+copies of \tcode{c} at the end of the list.
 
 \pnum
 \requires \tcode{T} shall be \tcode{CopyInsertable} into \tcode{*this}.
@@ -5794,8 +5787,6 @@
 \begin{itemdecl}
 template <class P> pair<iterator, bool> insert(P&& x);
 template <class P> iterator insert(const_iterator position, P&& x);
-template <class InputIterator>
-  void insert(InputIterator first, InputIterator last);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -8208,6 +8199,8 @@
 of each adaptor. If the container takes an allocator, then a compatible allocator may be passed in
 to the adaptor's constructor. Otherwise, normal copy or move construction is used for the container
 argument.
+The first template parameter \tcode{T} of the container adaptors
+shall denote the same type as \tcode{Container::value_type}.
 
 \pnum
 For container adaptors, no \tcode{swap} function throws an exception unless that

source/diagnostics.tex

@@ -552,7 +552,8 @@
 is a constant subexpression~(\ref{defns.const.subexpr}), if
 \begin{itemize}
 \item
-\tcode{NDEBUG} is defined at the point where \tcode{assert(E)} appears, or
+\tcode{NDEBUG} is defined at the point where \tcode{assert}
+is last defined or redefined, or
 \item
 \tcode{E} contextually converted to \tcode{bool}~(Clause~\ref{conv})
 is a constant subexpression that evaluates to the value \tcode{true}.

source/iterators.tex

@@ -2731,11 +2731,12 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \textit{in_stream} with \tcode{\&s}. \textit{value} may be initialized during
+Initializes \textit{in_stream} with \tcode{addressof(s)}.
+\textit{value} may be initialized during
 construction or the first time it is referenced.
 
 \pnum
-\postcondition \tcode{in_stream == \&s}.
+\postcondition \tcode{in_stream == addressof(s)}.
 \end{itemdescr}
 
 
@@ -2787,7 +2788,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{\&(operator*())}.
+\tcode{addressof(operator*())}.
 \end{itemdescr}
 
 \indexlibrary{\idxcode{operator++}!\idxcode{istream_iterator}}%
@@ -2925,7 +2926,8 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \textit{out_stream} with \tcode{\&s} and \textit{delim} with null.
+Initializes \textit{out_stream} with \tcode{addressof(s)} and
+\textit{delim} with null.
 \end{itemdescr}
 
 
@@ -2937,7 +2939,8 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \textit{out_stream} with \tcode{\&s} and \textit{delim} with \tcode{delimiter}.
+Initializes \textit{out_stream} with \tcode{addressof(s)} and
+\textit{delim} with \tcode{delimiter}.
 \end{itemdescr}
 
 

source/numerics.tex

@@ -9063,6 +9063,33 @@
 lldiv_t div(long long, long long);  // \tcode{lldiv()}
 \end{codeblock}
 
+\pnum
+To avoid ambiguities, \Cpp also adds the following overloads of \tcode{abs()}
+to \tcode{<cstdlib>}, with the semantics defined in \tcode{<cmath>}:
+\begin{codeblock}
+float abs(float);
+double abs(double);
+long double abs(long double);
+\end{codeblock}
+
+\pnum
+To avoid ambiguities, \Cpp also adds the following overloads of \tcode{abs()}
+to \tcode{<cmath>}, with the semantics defined in \tcode{<cstdlib>}:
+\begin{codeblock}
+int abs(int);
+long abs(long);
+long long abs(long long);
+\end{codeblock}
+
+\pnum
+If \tcode{abs()} is called with an argument of type \tcode{X}
+for which \tcode{is_unsigned<X>::value} is \tcode{true} and
+if \tcode{X} cannot be converted to \tcode{int}
+by integral promotion~(\ref{conv.prom}), the program is ill-formed.
+\enternote
+Arguments that can be promoted to \tcode{int} are permitted for compatibility with C.
+\exitnote
+
 \pnum
 In addition to the
 \tcode{double}

source/strings.tex

@@ -895,7 +895,9 @@
     explicit basic_string(const Allocator& a) noexcept;
     basic_string(const basic_string& str);
     basic_string(basic_string&& str) noexcept;
-    basic_string(const basic_string& str, size_type pos, size_type n = npos,
+    basic_string(const basic_string& str, size_type pos,
+                 const Allocator& a = Allocator());
+    basic_string(const basic_string& str, size_type pos, size_type n,
                  const Allocator& a = Allocator());
     basic_string(const charT* s,
                  size_type n, const Allocator& a = Allocator());
@@ -1181,8 +1183,7 @@
 
 \indexlibrary{\idxcode{basic_string}!constructor}%
 \begin{itemdecl}
-basic_string(const basic_string& str,
-             size_type pos, size_type n = npos,
+basic_string(const basic_string& str, size_type pos,
              const Allocator& a = Allocator());
 \end{itemdecl}
 
@@ -1198,12 +1199,31 @@
 Constructs an object of class
 \tcode{basic_string}
 and determines the effective length \tcode{rlen} of the initial string
-value as the smaller of \tcode{n} and
-\tcode{str.size() - pos},
+value as \tcode{str.size() - pos},
+as indicated in Table~\ref{tab:strings.ctr.2}.
+\end{itemdescr}
+
+\indexlibrary{\idxcode{basic_string}!constructor}%
+\begin{itemdecl}
+basic_string(const basic_string& str, size_type pos, size_type n,
+             const Allocator& a = Allocator());
+\end{itemdecl}
+
+\begin{itemdescr}
+\pnum
+\throws
+\tcode{out_of_range} if \tcode{pos > str.size()}.
+
+\pnum
+\effects
+Constructs an object of class \tcode{basic_string}
+and determines the effective length \tcode{rlen} of the initial string
+value as the smaller of \tcode{n} and \tcode{str.size() - pos},
 as indicated in Table~\ref{tab:strings.ctr.2}.
 
 \begin{libefftabvalue}
-{\tcode{basic_string(const basic_string\&, size_type, size_type, const Allocator\&)} effects}
+{\tcode{basic_string(const basic_string\&, size_type, const Allocator\&)}\protect\linebreak and
+\tcode{basic_string(const basic_string\&, size_type, size_type, const Allocator\&)} effects}
 {tab:strings.ctr.2}
 \tcode{data()}      &
 points at the first element of an allocated copy of \tcode{rlen} consecutive elements
@@ -2043,7 +2063,7 @@
 
 \begin{itemdescr}
 \pnum
-\effects Equivalent to \tcode{assign(str, 0, npos)}.
+\effects Equivalent to \tcode{*this = str}.
 
 \pnum
 \returns

source/threads.tex

@@ -1836,7 +1836,7 @@
 \effects Constructs an object of type \tcode{unique_lock} and calls \tcode{m.lock()}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == true}.
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == true}.
 \end{itemdescr}
 
 \indexlibrary{\idxcode{unique_lock}!constructor}%
@@ -1849,7 +1849,7 @@
 \effects Constructs an object of type \tcode{unique_lock}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == false}.
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == false}.
 \end{itemdescr}
 
 \indexlibrary{\idxcode{unique_lock}!constructor}%
@@ -1868,8 +1868,8 @@
 \effects Constructs an object of type \tcode{unique_lock} and calls \tcode{m.try_lock()}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == res}, where \tcode{res} is
-the value returned by the call to \tcode{m.try_lock()}.
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == res},
+where \tcode{res} is the value returned by the call to \tcode{m.try_lock()}.
 \end{itemdescr}
 
 \indexlibrary{\idxcode{unique_lock}!constructor}%
@@ -1885,7 +1885,7 @@
 \effects Constructs an object of type \tcode{unique_lock}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == true}.
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == true}.
 
 \pnum
 \throws Nothing.
@@ -1907,7 +1907,8 @@
 \effects Constructs an object of type \tcode{unique_lock} and calls \tcode{m.try_lock_until(abs_time)}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == res}, where \tcode{res} is
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == res},
+where \tcode{res} is
 the value returned by the call to \tcode{m.try_lock_until(abs_time)}.
 \end{itemdescr}
 
@@ -1926,7 +1927,8 @@
 \effects Constructs an object of type \tcode{unique_lock} and calls \tcode{m.try_lock_for(rel_time)}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == res}, where \tcode{res} is the value returned by the call to \tcode{m.try_lock_for(rel_time)}.
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == res},
+where \tcode{res} is the value returned by the call to \tcode{m.try_lock_for(rel_time)}.
 \end{itemdescr}
 
 \indexlibrary{\idxcode{unique_lock}!constructor}%
@@ -2264,7 +2266,7 @@
 \effects Constructs an object of type \tcode{shared_lock} and calls \tcode{m.lock_shared()}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == true}.
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == true}.
 \end{itemdescr}
 
 \indexlibrary{\idxcode{shared_lock}!constructor}%
@@ -2277,7 +2279,7 @@
 \effects Constructs an object of type \tcode{shared_lock}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == false}.
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == false}.
 \end{itemdescr}
 
 \indexlibrary{\idxcode{shared_lock}!constructor}%
@@ -2293,7 +2295,8 @@
 \effects Constructs an object of type \tcode{shared_lock} and calls \tcode{m.try_lock_shared()}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == res} where \tcode{res} is the
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == res}
+where \tcode{res} is the
 value returned by the call to \tcode{m.try_lock_shared()}.
 \end{itemdescr}
 
@@ -2310,7 +2313,7 @@
 \effects Constructs an object of type \tcode{shared_lock}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == true}.
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == true}.
 \end{itemdescr}
 
 \indexlibrary{\idxcode{shared_lock}!constructor}%
@@ -2329,7 +2332,8 @@
 \tcode{m.try_lock_shared_until(abs_time)}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == res} where \tcode{res}
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == res}
+where \tcode{res}
 is the value returned by the call to \tcode{m.try_lock_shared_until(abs_time)}.
 \end{itemdescr}
 
@@ -2349,7 +2353,8 @@
 \tcode{m.try_lock_shared_for(rel_time)}.
 
 \pnum
-\postconditions \tcode{pm == \&m} and \tcode{owns == res} where \tcode{res} is
+\postconditions \tcode{pm == addressof(m)} and \tcode{owns == res}
+where \tcode{res} is
 the value returned by the call to \tcode{m.try_lock_shared_for(rel_time)}.
 \end{itemdescr}