You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/05/22 23:07:06 UTC
git commit: Explicit conversion to Result<> from Unreachable to fix
compiler error.
Repository: mesos
Updated Branches:
refs/heads/master 220da6b41 -> ab41e9a21
Explicit conversion to Result<> from Unreachable to fix compiler error.
Review: https://reviews.apache.org/r/21777
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ab41e9a2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ab41e9a2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ab41e9a2
Branch: refs/heads/master
Commit: ab41e9a21a1b87885d0bc8d04e0582a96bfd87d1
Parents: 220da6b
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Thu May 22 14:06:05 2014 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu May 22 14:06:05 2014 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ab41e9a2/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
index 94d8b4c..72f3e70 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
@@ -64,6 +64,7 @@
#include <stout/result.hpp>
#include <stout/strings.hpp>
#include <stout/try.hpp>
+#include <stout/unreachable.hpp>
#include <stout/os/exists.hpp>
#include <stout/os/fork.hpp>
@@ -674,7 +675,7 @@ inline Result<uid_t> getuid(const Option<std::string>& user = None())
}
}
- return UNREACHABLE();
+ return Result<uid_t>(UNREACHABLE());
}
@@ -718,7 +719,7 @@ inline Result<gid_t> getgid(const Option<std::string>& user = None())
}
}
- return UNREACHABLE();
+ return Result<gid_t>(UNREACHABLE());
}