Repository: mesos Updated Branches: refs/heads/master f7bc7e470 -> f511a24a5
Windows: Fix build in src/launcher/executor.*. The namespace was refactored in some other cleanup: https://reviews.apache.org/r/50411/ Review: https://reviews.apache.org/r/50964/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f511a24a Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f511a24a Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f511a24a Branch: refs/heads/master Commit: f511a24a537c79964524a3276f10a85a20b5c92e Parents: f7bc7e4 Author: Joseph Wu <jos...@mesosphere.io> Authored: Wed Aug 10 13:11:52 2016 -0700 Committer: Joseph Wu <josep...@apache.org> Committed: Wed Aug 10 13:11:52 2016 -0700 ---------------------------------------------------------------------- src/launcher/windows/executor.cpp | 3 +-- src/launcher/windows/executor.hpp | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/f511a24a/src/launcher/windows/executor.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/windows/executor.cpp b/src/launcher/windows/executor.cpp index a7b8125..b51fde7 100644 --- a/src/launcher/windows/executor.cpp +++ b/src/launcher/windows/executor.cpp @@ -20,6 +20,7 @@ #include <stout/os.hpp> #include <stout/strings.hpp> +#include <stout/windows.hpp> #include <stout/os/close.hpp> @@ -30,7 +31,6 @@ using std::string; using std::vector; namespace mesos { -namespace v1 { namespace internal { PROCESS_INFORMATION launchTaskWindows( @@ -104,5 +104,4 @@ PROCESS_INFORMATION launchTaskWindows( } } // namespace internal { -} // namespace v1 { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/f511a24a/src/launcher/windows/executor.hpp ---------------------------------------------------------------------- diff --git a/src/launcher/windows/executor.hpp b/src/launcher/windows/executor.hpp index bae44f5..6f02912 100644 --- a/src/launcher/windows/executor.hpp +++ b/src/launcher/windows/executor.hpp @@ -19,12 +19,12 @@ #include <string> -#include <mesos/v1/mesos.hpp> +#include <mesos/mesos.hpp> #include <stout/option.hpp> +#include <stout/windows.hpp> namespace mesos { -namespace v1 { namespace internal { PROCESS_INFORMATION launchTaskWindows( @@ -32,7 +32,6 @@ PROCESS_INFORMATION launchTaskWindows( Option<std::string>& rootfs); } // namespace internal { -} // namespace v1 { } // namespace mesos { #endif // __LAUNCHER_WINDOWS_EXECUTOR_HPP__