|
@@ -46,7 +46,7 @@ TEST(MutexTest, lockMultiple) {
|
|
|
EXPECT_TRUE(mutex2.locked()); // Debug-only build
|
|
|
}
|
|
|
|
|
|
-void*
|
|
|
+void
|
|
|
testThread(Mutex* mutex)
|
|
|
{
|
|
|
// block=false (tryLock). This should not block indefinitely, but
|
|
@@ -57,8 +57,6 @@ testThread(Mutex* mutex)
|
|
|
}, Mutex::Locker::AlreadyLocked);
|
|
|
|
|
|
EXPECT_TRUE(mutex->locked()); // Debug-only build
|
|
|
-
|
|
|
- return NULL;
|
|
|
}
|
|
|
|
|
|
// Test the non-blocking variant using a second thread.
|