BIND 10 trac2198_2, updated. 6adfc244341c07a70eb0984536390486649316ae [2198] Don't return anything from thread functions
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Oct 16 00:30:41 UTC 2012
The branch, trac2198_2 has been updated
via 6adfc244341c07a70eb0984536390486649316ae (commit)
from 5b781744ac6f909958754f7e5947115ec799ac18 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6adfc244341c07a70eb0984536390486649316ae
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Oct 16 06:00:19 2012 +0530
[2198] Don't return anything from thread functions
-----------------------------------------------------------------------
Summary of changes:
.../util/tests/interprocess_sync_file_unittest.cc | 4 +---
src/lib/util/threads/tests/lock_unittest.cc | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/util/tests/interprocess_sync_file_unittest.cc b/src/lib/util/tests/interprocess_sync_file_unittest.cc
index ba901d4..242cc5b 100644
--- a/src/lib/util/tests/interprocess_sync_file_unittest.cc
+++ b/src/lib/util/tests/interprocess_sync_file_unittest.cc
@@ -113,15 +113,13 @@ TEST(InterprocessSyncFileTest, TestLock) {
EXPECT_EQ (0, unlink(TEST_DATA_TOPBUILDDIR "/test_lockfile"));
}
-void*
+void
threadTest(bool* locked)
{
InterprocessSyncFile sync2("test");
InterprocessSyncLocker locker2(sync2);
*locked = !locker2.tryLock();
-
- return NULL;
}
TEST(InterprocessSyncFileTest, TestLockThreaded) {
diff --git a/src/lib/util/threads/tests/lock_unittest.cc b/src/lib/util/threads/tests/lock_unittest.cc
index 0c6bcc7..8d337d5 100644
--- a/src/lib/util/threads/tests/lock_unittest.cc
+++ b/src/lib/util/threads/tests/lock_unittest.cc
@@ -45,7 +45,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
@@ -56,8 +56,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.
More information about the bind10-changes
mailing list