summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/thread
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2017-07-27 17:44:03 +0000
committerMarshall Clow <mclow.lists@gmail.com>2017-07-27 17:44:03 +0000
commit88c893cc33a2f2a5dbb531bbb92849beba536c62 (patch)
tree6a7a8b07d6675aaeeb8e1e7991c5dd291d3ad32b /libcxx/test/std/thread
parentde46274d7bb41dcd9195d3436dc585fd64326ec0 (diff)
downloadbcm5719-llvm-88c893cc33a2f2a5dbb531bbb92849beba536c62.tar.gz
bcm5719-llvm-88c893cc33a2f2a5dbb531bbb92849beba536c62.zip
Implement P0739R0: 'Some improvements to class template argument deduction integration into the standard library' This is an API change (not ABI change) due to a late change in the c++17 standard
llvm-svn: 309296
Diffstat (limited to 'libcxx/test/std/thread')
-rw-r--r--libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/adopt_lock.pass.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/adopt_lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/adopt_lock.pass.cpp
index 78165383a15..d49ba8d1139 100644
--- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/adopt_lock.pass.cpp
+++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/adopt_lock.pass.cpp
@@ -14,7 +14,7 @@
// template <class ...Mutex> class scoped_lock;
-// scoped_lock(Mutex&..., adopt_lock_t);
+// scoped_lock(adopt_lock_t, Mutex&...);
#include <mutex>
#include <cassert>
@@ -43,7 +43,7 @@ int main()
using LG = std::scoped_lock<TestMutex>;
m1.lock();
{
- LG lg(m1, std::adopt_lock);
+ LG lg(std::adopt_lock, m1);
assert(m1.locked);
}
assert(!m1.locked);
@@ -53,7 +53,7 @@ int main()
using LG = std::scoped_lock<TestMutex, TestMutex>;
m1.lock(); m2.lock();
{
- LG lg(m1, m2, std::adopt_lock);
+ LG lg(std::adopt_lock, m1, m2);
assert(m1.locked && m2.locked);
}
assert(!m1.locked && !m2.locked);
@@ -63,7 +63,7 @@ int main()
using LG = std::scoped_lock<TestMutex, TestMutex, TestMutex>;
m1.lock(); m2.lock(); m3.lock();
{
- LG lg(m1, m2, m3, std::adopt_lock);
+ LG lg(std::adopt_lock, m1, m2, m3);
assert(m1.locked && m2.locked && m3.locked);
}
assert(!m1.locked && !m2.locked && !m3.locked);
OpenPOWER on IntegriCloud