Moved WSTRINGIFY out of a namespace.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/47928255 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/47928255 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/47928255 Branch: refs/heads/master Commit: 4792825580250b6a5a1fa050e6a2496592bbd2a8 Parents: ddc775a Author: Benjamin Hindman <[email protected]> Authored: Wed Jul 9 13:11:35 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Aug 4 15:08:17 2014 -0700 ---------------------------------------------------------------------- src/common/status_utils.hpp | 8 -------- src/health-check/main.cpp | 2 -- src/launcher/executor.cpp | 3 --- src/master/master.cpp | 2 -- src/slave/containerizer/external_containerizer.cpp | 3 --- src/slave/slave.cpp | 2 -- src/tests/script.cpp | 2 -- 7 files changed, 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/47928255/src/common/status_utils.hpp ---------------------------------------------------------------------- diff --git a/src/common/status_utils.hpp b/src/common/status_utils.hpp index c51a8c6..8ef012a 100644 --- a/src/common/status_utils.hpp +++ b/src/common/status_utils.hpp @@ -24,10 +24,6 @@ #include <stout/option.hpp> #include <stout/stringify.hpp> -namespace mesos { -namespace internal { -namespace status { - inline std::string WSTRINGIFY(int status) { std::string message; @@ -41,8 +37,4 @@ inline std::string WSTRINGIFY(int status) return message; } -} // namespace status { -} // namespace internal { -} // namespace mesos { - #endif // __STATUS_UTILS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/47928255/src/health-check/main.cpp ---------------------------------------------------------------------- diff --git a/src/health-check/main.cpp b/src/health-check/main.cpp index 10d57a0..472bffc 100644 --- a/src/health-check/main.cpp +++ b/src/health-check/main.cpp @@ -60,8 +60,6 @@ namespace internal { using namespace process; -using namespace mesos::internal::status; - class HealthCheckerProcess : public ProtobufProcess<HealthCheckerProcess> { public: http://git-wip-us.apache.org/repos/asf/mesos/blob/47928255/src/launcher/executor.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp index 948673e..b096b68 100644 --- a/src/launcher/executor.cpp +++ b/src/launcher/executor.cpp @@ -69,9 +69,6 @@ namespace internal { using namespace process; -using namespace mesos::internal::status; - - class CommandExecutorProcess : public ProtobufProcess<CommandExecutorProcess> { public: http://git-wip-us.apache.org/repos/asf/mesos/blob/47928255/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index 77f2536..5630680 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -93,8 +93,6 @@ using process::metrics::Counter; using memory::shared_ptr; -using namespace mesos::internal::status; - namespace mesos { namespace internal { namespace master { http://git-wip-us.apache.org/repos/asf/mesos/blob/47928255/src/slave/containerizer/external_containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/external_containerizer.cpp b/src/slave/containerizer/external_containerizer.cpp index 03de1fc..e5726e1 100644 --- a/src/slave/containerizer/external_containerizer.cpp +++ b/src/slave/containerizer/external_containerizer.cpp @@ -63,9 +63,6 @@ using tuples::tuple; using namespace process; -using namespace mesos::internal::status; - - namespace mesos { namespace internal { namespace slave { http://git-wip-us.apache.org/repos/asf/mesos/blob/47928255/src/slave/slave.cpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp index 2f39d61..ef921e1 100644 --- a/src/slave/slave.cpp +++ b/src/slave/slave.cpp @@ -100,8 +100,6 @@ namespace slave { using namespace state; -using namespace mesos::internal::status; - Slave::Slave(const slave::Flags& _flags, MasterDetector* _detector, Containerizer* _containerizer, http://git-wip-us.apache.org/repos/asf/mesos/blob/47928255/src/tests/script.cpp ---------------------------------------------------------------------- diff --git a/src/tests/script.cpp b/src/tests/script.cpp index 0d29c6d..3129479 100644 --- a/src/tests/script.cpp +++ b/src/tests/script.cpp @@ -42,8 +42,6 @@ using std::string; -using namespace mesos::internal::status; - namespace mesos { namespace internal { namespace tests {
