Repository: mesos Updated Branches: refs/heads/master 883c7256c -> b70a863d2
Fixed a few compiler warnings in stout. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b70a863d Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b70a863d Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b70a863d Branch: refs/heads/master Commit: b70a863d2214231e306ce6e2932557439a5ecba6 Parents: 883c725 Author: Jie Yu <[email protected]> Authored: Thu Aug 14 11:44:19 2014 -0700 Committer: Jie Yu <[email protected]> Committed: Thu Aug 14 11:44:49 2014 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/stout/tests/os/setns_tests.cpp | 2 ++ 3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b70a863d/3rdparty/libprocess/3rdparty/stout/tests/os/setns_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os/setns_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os/setns_tests.cpp index ff9f10b..ad8e37a 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/os/setns_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/os/setns_tests.cpp @@ -19,6 +19,8 @@ static void* child(void* arg) // Newly created threads have PTHREAD_CANCEL_ENABLE and // PTHREAD_CANCEL_DEFERRED so they can be cancelled. while (true) { os::sleep(Seconds(1)); } + + return NULL; } http://git-wip-us.apache.org/repos/asf/mesos/blob/b70a863d/3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp index c723bd7..56a63e8 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp @@ -78,6 +78,8 @@ void* threadFunction(void*) // Newly created threads have PTHREAD_CANCEL_ENABLE and // PTHREAD_CANCEL_DEFERRED so they can be cancelled from the main thread. while (true) { sleep(1); } + + return NULL; } @@ -102,7 +104,7 @@ TEST(ProcTest, MultipleThreads) EXPECT_EQ(1u, threads.get().count(::getpid())); // Terminate the threads. - for (int i = 0; i < numThreads; i++) + for (size_t i = 0; i < numThreads; i++) { EXPECT_EQ(0, pthread_cancel(pthreads[i])); EXPECT_EQ(0, pthread_join(pthreads[i], NULL));
