Merge 2019-11 LWG Motion 7

P1869R1 Rename condition_variable_any interruptible wait methods

Author: zygoloid

source/support.tex

@@ -614,7 +614,7 @@
 #define @\defnlibxname{cpp_lib_is_null_pointer}@                   201309L // also in \libheader{type_traits}
 #define @\defnlibxname{cpp_lib_is_pointer_interconvertible}@       201907L // also in \libheader{type_traits}
 #define @\defnlibxname{cpp_lib_is_swappable}@                      201603L // also in \libheader{type_traits}
-#define @\defnlibxname{cpp_lib_jthread}@                           201907L // also in \libheader{stop_token}, \libheader{thread}
+#define @\defnlibxname{cpp_lib_jthread}@                           201911L // also in \libheader{stop_token}, \libheader{thread}
 #define @\defnlibxname{cpp_lib_latch}@                             201907L // also in \libheader{latch}
 #define @\defnlibxname{cpp_lib_launder}@                           201606L // also in \libheader{new}
 #define @\defnlibxname{cpp_lib_list_remove_return_type}@           201806L // also in \libheader{forward_list}, \libheader{list}

source/threads.tex

@@ -4752,13 +4752,13 @@
 
     // \ref{thread.condvarany.intwait}, interruptible waits
     template<class Lock, class Predicate>
-      bool wait_until(Lock& lock, Predicate pred, stop_token stoken);
+      bool wait(Lock& lock, stop_token stoken, Predicate pred);
     template<class Lock, class Clock, class Duration, class Predicate>
-      bool wait_until(Lock& lock, const chrono::time_point<Clock, Duration>& abs_time
-                      Predicate pred, stop_token stoken);
+      bool wait_until(Lock& lock, stop_token stoken,
+                      const chrono::time_point<Clock, Duration>& abs_time, Predicate pred);
     template<class Lock, class Rep, class Period, class Predicate>
-      bool wait_for(Lock& lock, const chrono::duration<Rep, Period>& rel_time,
-                    Predicate pred, stop_token stoken);
+      bool wait_for(Lock& lock, stop_token stoken,
+                    const chrono::duration<Rep, Period>& rel_time, Predicate pred);
   };
 }
 \end{codeblock}
@@ -5034,7 +5034,7 @@
 
 \begin{itemdecl}
 template<class Lock, class Predicate>
-  bool wait_until(Lock& lock, Predicate pred, stop_token stoken);
+  bool wait(Lock& lock, stop_token stoken, Predicate pred);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -5077,8 +5077,8 @@
 
 \begin{itemdecl}
 template<class Lock, class Clock, class Duration, class Predicate>
-  bool wait_until(Lock& lock, const chrono::time_point<Clock, Duration>& abs_time
-                  Predicate pred, stop_token stoken);
+  bool wait_until(Lock& lock, stop_token stoken,
+                  const chrono::time_point<Clock, Duration>& abs_time, Predicate pred);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -5130,8 +5130,8 @@
 
 \begin{itemdecl}
 template<class Lock, class Rep, class Period, class Predicate>
-  bool wait_for(Lock& lock, const chrono::duration<Rep, Period>& rel_time,
-                Predicate pred, stop_token stoken);
+  bool wait_for(Lock& lock, stop_token stoken,
+                const chrono::duration<Rep, Period>& rel_time, Predicate pred);
 \end{itemdecl}
 
 \begin{itemdescr}