Repository: mesos Updated Branches: refs/heads/master d144fc7ba -> d018eb712
Candidate port of result.hpp. Review: https://reviews.apache.org/r/36971 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d018eb71 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d018eb71 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d018eb71 Branch: refs/heads/master Commit: d018eb712000888a996046fb9b5d8bb8e79e23e9 Parents: d144fc7 Author: Alex Clemmer <[email protected]> Authored: Fri Jul 31 11:37:57 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Fri Jul 31 11:37:58 2015 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/d018eb71/3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp index 3d20614..f0b0a48 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp @@ -68,10 +68,10 @@ public: Try<Option<T>>(Some(option.get())) : Try<Option<T>>(None())) {} - Result(const Try<T>& _try) - : data(_try.isSome() ? - Try<Option<T>>(Some(_try.get())) : - Try<Option<T>>(Error(_try.error()))) {} + Result(const Try<T>& _t) + : data(_t.isSome() ? + Try<Option<T>>(Some(_t.get())) : + Try<Option<T>>(Error(_t.error()))) {} Result(const None& none) : data(none) {}
