Removed `void` parameters in stout.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/93a57082 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/93a57082 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/93a57082 Branch: refs/heads/master Commit: 93a5708294d6d66a5e1350a0bb1c8fe87605ee1d Parents: 037e0f8 Author: Michael Park <[email protected]> Authored: Wed Jan 20 14:14:39 2016 -0800 Committer: Michael Park <[email protected]> Committed: Wed Jan 20 15:29:05 2016 -0800 ---------------------------------------------------------------------- .../stout/include/stout/os/posix/fork.hpp | 22 ++++++++++---------- .../3rdparty/stout/tests/os_tests.cpp | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/93a57082/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp index 11557e3..8d8ed0b 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp @@ -112,7 +112,7 @@ struct Wait {}; struct Fork { // -+- parent. - Fork(const Option<void(*)(void)>& _function, + Fork(const Option<void(*)()>& _function, const Exec& _exec) : function(_function), exec(_exec) {} @@ -121,14 +121,14 @@ struct Fork // -+- parent // \--- child. - Fork(const Option<void(*)(void)>& _function, + Fork(const Option<void(*)()>& _function, const Fork& fork1) : function(_function) { children.push_back(fork1); } - Fork(const Option<void(*)(void)>& _function, + Fork(const Option<void(*)()>& _function, const Fork& fork1, const Exec& _exec) : function(_function), @@ -137,7 +137,7 @@ struct Fork children.push_back(fork1); } - Fork(const Option<void(*)(void)>& _function, + Fork(const Option<void(*)()>& _function, const Fork& fork1, const Wait& _wait) : function(_function), @@ -150,7 +150,7 @@ struct Fork // -+- parent // |--- child // \--- child. - Fork(const Option<void(*)(void)>& _function, + Fork(const Option<void(*)()>& _function, const Fork& fork1, const Fork& fork2) : function(_function) @@ -159,7 +159,7 @@ struct Fork children.push_back(fork2); } - Fork(const Option<void(*)(void)>& _function, + Fork(const Option<void(*)()>& _function, const Fork& fork1, const Fork& fork2, const Exec& _exec) @@ -170,7 +170,7 @@ struct Fork children.push_back(fork2); } - Fork(const Option<void(*)(void)>& _function, + Fork(const Option<void(*)()>& _function, const Fork& fork1, const Fork& fork2, const Wait& _wait) @@ -186,7 +186,7 @@ struct Fork // |--- child // |--- child // \--- child. - Fork(const Option<void(*)(void)>& _function, + Fork(const Option<void(*)()>& _function, const Fork& fork1, const Fork& fork2, const Fork& fork3) @@ -197,7 +197,7 @@ struct Fork children.push_back(fork3); } - Fork(const Option<void(*)(void)>& _function, + Fork(const Option<void(*)()>& _function, const Fork& fork1, const Fork& fork2, const Fork& fork3, @@ -210,7 +210,7 @@ struct Fork children.push_back(fork3); } - Fork(const Option<void(*)(void)>& _function, + Fork(const Option<void(*)()>& _function, const Fork& fork1, const Fork& fork2, const Fork& fork3, @@ -440,7 +440,7 @@ public: } private: - Option<void(*)(void)> function; + Option<void(*)()> function; Option<const Exec> exec; Option<const Wait> wait; std::vector<Fork> children; http://git-wip-us.apache.org/repos/asf/mesos/blob/93a57082/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp index e0a898d..dc8cf74 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp @@ -564,7 +564,7 @@ TEST_F(OsTest, Processes) } -void dosetsid(void) +void dosetsid() { if (::setsid() == -1) { ABORT(string("Failed to setsid: ") + os::strerror(errno));
