[libcxx] r273349 - Avoid assignment in return. Patch from STL at microsoft.com

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Tue Jun 21 20:00:32 2016
New Revision: 273349

URL: http://llvm.org/viewvc/llvm-project?rev=273349&view=rev
Log:
Avoid assignment in return. Patch from STL at microsoft.com

Modified:
    libcxx/trunk/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_adopt_lock.pass.cpp
    libcxx/trunk/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_mutex.pass.cpp

Modified: libcxx/trunk/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_adopt_lock.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_adopt_lock.pass.cpp?rev=273349&r1=273348&r2=273349&view=diff
==============================================================================
--- libcxx/trunk/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_adopt_lock.pass.cpp (original)
+++ libcxx/trunk/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_adopt_lock.pass.cpp Tue Jun 21 20:00:32 2016
@@ -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;

Modified: libcxx/trunk/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_mutex.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_mutex.pass.cpp?rev=273349&r1=273348&r2=273349&view=diff
==============================================================================
--- libcxx/trunk/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_mutex.pass.cpp (original)
+++ libcxx/trunk/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/variadic_mutex.pass.cpp Tue Jun 21 20:00:32 2016
@@ -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;