Repository: mesos Updated Branches: refs/heads/master 1d70aa029 -> 0796c2b6a
Properly qualify process::Failure() in posix.hpp. Fixed compilation problems when compiling files which include <slave/containerizer/isolators/posix.hpp> without "using process::Failure". Review: https://reviews.apache.org/r/26791 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0796c2b6 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0796c2b6 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0796c2b6 Branch: refs/heads/master Commit: 0796c2b6ac7b8a7987f5eee1d5d98fec8a1e56b0 Parents: 1d70aa0 Author: Kapil Arya <[email protected]> Authored: Wed Oct 15 18:16:51 2014 -0700 Committer: Niklas Q. Nielsen <[email protected]> Committed: Thu Oct 16 08:18:59 2014 -0700 ---------------------------------------------------------------------- src/slave/containerizer/isolators/posix.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0796c2b6/src/slave/containerizer/isolators/posix.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/posix.hpp b/src/slave/containerizer/isolators/posix.hpp index f120aaf..6038e92 100644 --- a/src/slave/containerizer/isolators/posix.hpp +++ b/src/slave/containerizer/isolators/posix.hpp @@ -163,7 +163,7 @@ public: Try<ResourceStatistics> usage = mesos::internal::usage(pids.get(containerId).get(), false, true); if (usage.isError()) { - return Failure(usage.error()); + return process::Failure(usage.error()); } return usage.get(); } @@ -196,7 +196,7 @@ public: Try<ResourceStatistics> usage = mesos::internal::usage(pids.get(containerId).get(), true, false); if (usage.isError()) { - return Failure(usage.error()); + return process::Failure(usage.error()); } return usage.get(); }
