Repository: mesos Updated Branches: refs/heads/master 3baa60965 -> a99ed23b6
Use special constructor for Option<T> from Some<T>. This is to ensure that we handle Option<Option<T>> correctly. Review: https://reviews.apache.org/r/34276 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d9484def Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d9484def Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d9484def Branch: refs/heads/master Commit: d9484def01e5e928b82632c2a4d2bba291a676b2 Parents: 3baa609 Author: Joris Van Remoortere <[email protected]> Authored: Tue May 26 09:42:23 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Tue May 26 09:42:24 2015 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/d9484def/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 ea79b50..8aa59f1 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp @@ -45,7 +45,7 @@ public: Option(const None& none) : state(NONE) {} template <typename U> - Option(const _Some<U>& some) : Option(some.t) {} + Option(const _Some<U>& some) : state(SOME), t(some.t) {} Option(const Option<T>& that) : state(that.state) {
