[2205] Merge branch 'trac2332' into trac2205

src/lib/util/threads/tests/condvar_unittest.cc

@@ -128,12 +128,6 @@ TEST_F(CondVarTest, multiWaits) {
     EXPECT_EQ(4, shared_var);
 }
 
-void
-waiter(CondVar* condver, Mutex* mutex) {
-    Mutex::Locker locker(*mutex);
-    condver->wait(*mutex);
-}
-
 // Similar to the previous version of the same function, but just do
 // condvar operations.  It will never wake up.
 void