summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/thread/thread.mutex
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2015-03-27 07:07:51 +0000
committerEric Fiselier <eric@efcs.ca>2015-03-27 07:07:51 +0000
commit2f135df8f9f8be0fa035692a8793dc79816aec2f (patch)
tree8b3b53b7624134ea4aa0af4eb256e1febf4e99c9 /libcxx/test/std/thread/thread.mutex
parent43adfb30d5db64c9ec39466bf02b5846296b8745 (diff)
downloadbcm5719-llvm-2f135df8f9f8be0fa035692a8793dc79816aec2f.tar.gz
bcm5719-llvm-2f135df8f9f8be0fa035692a8793dc79816aec2f.zip
Fix PR23041. Use lock_shared() as opposed to lock() in shared_lock test.
llvm-svn: 233367
Diffstat (limited to 'libcxx/test/std/thread/thread.mutex')
-rw-r--r--libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp
index 9082e57b64a..3b49b302905 100644
--- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp
+++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp
@@ -22,7 +22,7 @@ int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_timed_mutex m;
- m.lock();
+ m.lock_shared();
std::shared_lock<std::shared_timed_mutex> lk(m, std::adopt_lock);
assert(lk.mutex() == &m);
assert(lk.owns_lock() == true);
OpenPOWER on IntegriCloud