summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/thread/thread.mutex
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-06-22 01:00:32 +0000
committerEric Fiselier <eric@efcs.ca>2016-06-22 01:00:32 +0000
commitdf839e04b40a7ab7c71cd4940b02132a590066ce (patch)
treef43be97507bd0aac6e861f1ee501ed09405dfc78 /libcxx/test/std/thread/thread.mutex
parentc1d08ff06924ad8de27661372029d10ca845ad40 (diff)
downloadbcm5719-llvm-df839e04b40a7ab7c71cd4940b02132a590066ce.tar.gz
bcm5719-llvm-df839e04b40a7ab7c71cd4940b02132a590066ce.zip
Avoid assignment in return. Patch from STL@microsoft.com
llvm-svn: 273349
Diffstat (limited to 'libcxx/test/std/thread/thread.mutex')
-rw-r--r--libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_adopt_lock.pass.cpp2
-rw-r--r--libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_mutex.pass.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_adopt_lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_adopt_lock.pass.cpp
index 0de002a2a42..840af6788d0 100644
--- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_adopt_lock.pass.cpp
+++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_adopt_lock.pass.cpp
@@ -25,7 +25,7 @@ struct TestMutex {
TestMutex() = default;
void lock() { assert(!locked); locked = true; }
- bool try_lock() { if (locked) return false; return locked = true; }
+ bool try_lock() { if (locked) return false; locked = true; return true; }
void unlock() { assert(locked); locked = false; }
TestMutex(TestMutex const&) = delete;
diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_mutex.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_mutex.pass.cpp
index 68f84fe32de..4910d837cae 100644
--- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_mutex.pass.cpp
+++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_mutex.pass.cpp
@@ -28,7 +28,7 @@ struct TestMutex {
~TestMutex() { assert(!locked); }
void lock() { assert(!locked); locked = true; }
- bool try_lock() { if (locked) return false; return locked = true; }
+ bool try_lock() { if (locked) return false; locked = true; return true; }
void unlock() { assert(locked); locked = false; }
TestMutex(TestMutex const&) = delete;
OpenPOWER on IntegriCloud