Yes sorry I pushed this out just as we went to dinner. I meant to redo the commit message. This is actually a required change to compile on windows. The _try is (I think) a macro defined somewhere. A better name would communicate this. I'll update the review (I haven't had time yet today). Sent from Outlook
_____________________________ From: Benjamin Mahler <benjamin.mah...@gmail.com> Sent: Friday, July 31, 2015 12:15 Subject: Re: mesos git commit: Candidate port of result.hpp. To: dev <dev@mesos.apache.org> Cc: Benjamin Hindman <b...@mesosphere.io>, <clemmer.alexan...@gmail.com>, <comm...@mesos.apache.org> Hm.. this could have used a better commit name, what is a "candidate port"? Looks like just a variable rename to me :) On Fri, Jul 31, 2015 at 11:38 AM, <b...@apache.org> wrote: 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 < clemmer.alexan...@gmail.com> Authored: Fri Jul 31 11:37:57 2015 -0700 Committer: Benjamin Hindman < benjamin.hind...@gmail.com> 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) {}