Merge 2017-07 LWG Motion 35

Author: zygoloid

source/threads.tex

@@ -1742,7 +1742,7 @@
     using mutex_type = Mutex;  // If \tcode{MutexTypes...} consists of the single type \tcode{Mutex}
 
     explicit scoped_lock(MutexTypes&... m);
-    explicit scoped_lock(MutexTypes&... m, adopt_lock_t);
+    explicit scoped_lock(adopt_lock_t, MutexTypes&... m);
     ~scoped_lock();
 
     scoped_lock(const scoped_lock&) = delete;
@@ -1789,7 +1789,7 @@
 
 \indexlibrary{\idxcode{scoped_lock}!constructor}%
 \begin{itemdecl}
-explicit scoped_lock(MutexTypes&... m, adopt_lock_t);
+explicit scoped_lock(adopt_lock_t, MutexTypes&... m);
 \end{itemdecl}
 
 \begin{itemdescr}

source/utilities.tex

@@ -4053,8 +4053,9 @@
 
 \pnum
 \remarks
-This function shall not participate in overload resolution unless
-\tcode{is_same_v<decay_t<T>, variant>} is \tcode{false},
+This function shall not participate in overload resolution
+unless \tcode{sizeof...(Types)} is nonzero,
+unless \tcode{is_same_v<decay_t<T>, variant>} is \tcode{false},
 unless \tcode{decay_t<T>} is neither
 a specialization of \tcode{in_place_type_t}
 nor a specialization of \tcode{in_place_index_t},