Repository: mesos Updated Branches: refs/heads/master 07abeaa8c -> 49da76c9a
Rename Option<T>::get(const T& _t) to getOrElse() in stout. Review: https://reviews.apache.org/r/35287 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/959d9069 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/959d9069 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/959d9069 Branch: refs/heads/master Commit: 959d90692c04a5a4357024d43ce9219cf97b1d1f Parents: 07abeaa Author: Mark Wang <[email protected]> Authored: Mon Jul 6 12:52:27 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Jul 6 12:52:28 2015 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp | 2 +- 3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/959d9069/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp index 3d9b7a7..549fc46 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp @@ -131,7 +131,7 @@ public: T& get() { assert(isSome()); return t; } // This must return a copy to avoid returning a reference to a temporary. - T get(const T& _t) const { return isNone() ? _t : t; } + T getOrElse(const T& _t) const { return isNone() ? _t : t; } private: enum State { http://git-wip-us.apache.org/repos/asf/mesos/blob/959d9069/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp index 784104f..b11c7ac 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp @@ -150,7 +150,7 @@ inline Result<Process> process(pid_t pid) None(), None(), None(), - command.get(std::string(process.kp_proc.p_comm)), + command.getOrElse(std::string(process.kp_proc.p_comm)), process.kp_proc.p_stat & SZOMB); } else { return Process(process.kp_proc.p_pid, @@ -160,7 +160,7 @@ inline Result<Process> process(pid_t pid) Bytes(task.pti_resident_size), Nanoseconds(task.pti_total_user), Nanoseconds(task.pti_total_system), - command.get(std::string(process.kp_proc.p_comm)), + command.getOrElse(std::string(process.kp_proc.p_comm)), process.kp_proc.p_stat & SZOMB); } } http://git-wip-us.apache.org/repos/asf/mesos/blob/959d9069/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp index d87cf22..4a0f60b 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp @@ -142,3 +142,12 @@ TEST(OptionTest, NonCopyable) o4 = Some(NonCopyable()); ASSERT_SOME(o4); } + + +TEST(OptionTest, GetOrElse) +{ + Option<string> something = string("Something"); + Option<string> none = None(); + EXPECT_EQ("Something", something.getOrElse("Else")); + EXPECT_EQ("Else", none.getOrElse("Else")); +}
