Merge 2016-02 LWG Motion 1

Author: zygoloid

source/containers.tex

@@ -8680,7 +8680,8 @@
 \begin{itemdescr}
 \pnum
 \effects\ Initializes \tcode{c} with \tcode{cont} as the first argument and \tcode{a} as the second
-argument, and initializes \tcode{comp} with \tcode{compare}.
+argument, and initializes \tcode{comp} with \tcode{compare};
+calls \tcode{make_heap(c.begin(), c.end(), comp)}.
 \end{itemdescr}
 
 \begin{itemdecl}
@@ -8691,7 +8692,8 @@
 \begin{itemdescr}
 \pnum
 \effects\ Initializes \tcode{c} with \tcode{std::move(cont)} as the first argument and \tcode{a}
-as the second argument, and initializes \tcode{comp} with \tcode{compare}.
+as the second argument, and initializes \tcode{comp} with \tcode{compare};
+calls \tcode{make_heap(c.begin(), c.end(), comp)}.
 \end{itemdescr}
 
 \begin{itemdecl}

source/threads.tex

@@ -3796,7 +3796,6 @@
     void set_exception(exception_ptr p);
 
     // setting the result with deferred notification
-    void set_value_at_thread_exit(const R& r);
     void set_value_at_thread_exit(@\seebelow@);
     void set_exception_at_thread_exit(exception_ptr p);
   };
@@ -3810,7 +3809,8 @@
 \pnum
 The implementation shall provide the template \tcode{promise} and two specializations,
 \tcode{promise<R\&>} and \tcode{promise<\brk{}void>}. These differ only in the argument type
-of the member function \tcode{set_value}, as set out in its description, below.
+of the member functions \tcode{set_value} and \tcode{set_value_at_thread_exit},
+as set out in their descriptions, below.
 
 \pnum
 The \tcode{set_value}, \tcode{set_exception}, \tcode{set_value_at_thread_exit},
@@ -3969,6 +3969,9 @@
 \end{itemdecl}
 
 \begin{itemdescr}
+\pnum
+\requires \tcode{p} is not null.
+
 \pnum
 \effects atomically stores the exception pointer \tcode{p} in the shared state
 and makes that state ready~(\ref{futures.state}).
@@ -4029,6 +4032,9 @@
 \end{itemdecl}
 
 \begin{itemdescr}
+\pnum
+\requires \tcode{p} is not null.
+
 \pnum
 \effects Stores the exception pointer \tcode{p} in the shared state without
 making that state ready immediately. Schedules that state to be made ready when