You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ka...@apache.org on 2016/04/18 14:22:30 UTC
[10/11] mesos git commit: Replaced 'using namespace' with 'using'.
Replaced 'using namespace' with 'using'.
Mostly for mesos::state and mesos::log.
Review: https://reviews.apache.org/r/46295
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/aecce4dd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/aecce4dd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/aecce4dd
Branch: refs/heads/master
Commit: aecce4dd764bde92edb98c3d6b1c067a7ceb8f0c
Parents: 181121f
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Fri Apr 15 21:04:06 2016 -0400
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Sun Apr 17 23:38:26 2016 -0400
----------------------------------------------------------------------
src/java/jni/org_apache_mesos_state_AbstractState.cpp | 6 ++++--
src/java/jni/org_apache_mesos_state_LevelDBState.cpp | 6 ++++--
src/java/jni/org_apache_mesos_state_LogState.cpp | 8 ++++----
src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp | 6 ++++--
src/local/local.cpp | 2 +-
src/log/log.cpp | 4 +++-
src/log/tool/benchmark.cpp | 4 ++--
src/log/tool/replica.cpp | 4 ++--
src/master/main.cpp | 3 ++-
src/state/log.cpp | 4 ++--
src/tests/log_tests.cpp | 4 ++--
src/tests/state_tests.cpp | 12 ++++++------
12 files changed, 36 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/java/jni/org_apache_mesos_state_AbstractState.cpp
----------------------------------------------------------------------
diff --git a/src/java/jni/org_apache_mesos_state_AbstractState.cpp b/src/java/jni/org_apache_mesos_state_AbstractState.cpp
index 2ab748f..728e935 100644
--- a/src/java/jni/org_apache_mesos_state_AbstractState.cpp
+++ b/src/java/jni/org_apache_mesos_state_AbstractState.cpp
@@ -30,13 +30,15 @@
#include "construct.hpp"
#include "convert.hpp"
-using namespace mesos::state;
-
using process::Future;
using std::set;
using std::string;
+using mesos::state::State;
+using mesos::state::Storage;
+using mesos::state::Variable;
+
extern "C" {
// TODO(jmlvanre): Deprecate the JNI functions that are in the AbstractState
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/java/jni/org_apache_mesos_state_LevelDBState.cpp
----------------------------------------------------------------------
diff --git a/src/java/jni/org_apache_mesos_state_LevelDBState.cpp b/src/java/jni/org_apache_mesos_state_LevelDBState.cpp
index 704367f..b06956f 100644
--- a/src/java/jni/org_apache_mesos_state_LevelDBState.cpp
+++ b/src/java/jni/org_apache_mesos_state_LevelDBState.cpp
@@ -24,10 +24,12 @@
#include "construct.hpp"
#include "convert.hpp"
-using namespace mesos::state;
-
using std::string;
+using mesos::state::LevelDBStorage;
+using mesos::state::State;
+using mesos::state::Storage;
+
extern "C" {
/*
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/java/jni/org_apache_mesos_state_LogState.cpp
----------------------------------------------------------------------
diff --git a/src/java/jni/org_apache_mesos_state_LogState.cpp b/src/java/jni/org_apache_mesos_state_LogState.cpp
index 1a60b87..2f2a571 100644
--- a/src/java/jni/org_apache_mesos_state_LogState.cpp
+++ b/src/java/jni/org_apache_mesos_state_LogState.cpp
@@ -28,14 +28,14 @@
#include "construct.hpp"
#include "convert.hpp"
-using namespace mesos;
-
-using namespace mesos::state;
-
using std::string;
using mesos::log::Log;
+using mesos::state::LogStorage;
+using mesos::state::State;
+using mesos::state::Storage;
+
extern "C" {
/*
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp
----------------------------------------------------------------------
diff --git a/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp b/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp
index 857300b..5cce558 100644
--- a/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp
+++ b/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp
@@ -26,10 +26,12 @@
#include "construct.hpp"
#include "convert.hpp"
-using namespace mesos::state;
-
using std::string;
+using mesos::state::State;
+using mesos::state::Storage;
+using mesos::state::ZooKeeperStorage;
+
extern "C" {
/*
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/local/local.cpp
----------------------------------------------------------------------
diff --git a/src/local/local.cpp b/src/local/local.cpp
index c800f78..7de8a24 100644
--- a/src/local/local.cpp
+++ b/src/local/local.cpp
@@ -79,7 +79,7 @@
using namespace mesos::internal;
using namespace mesos::internal::log;
-using namespace mesos::log;
+using mesos::log::Log;
using mesos::master::allocator::Allocator;
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/log/log.cpp
----------------------------------------------------------------------
diff --git a/src/log/log.cpp b/src/log/log.cpp
index eb3f85f..5916b2b 100644
--- a/src/log/log.cpp
+++ b/src/log/log.cpp
@@ -739,7 +739,9 @@ void LogWriterProcess::failed(const string& message, const string& reason)
namespace log {
-using namespace mesos::internal::log;
+using mesos::internal::log::LogProcess;
+using mesos::internal::log::LogReaderProcess;
+using mesos::internal::log::LogWriterProcess;
/////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/log/tool/benchmark.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/benchmark.cpp b/src/log/tool/benchmark.cpp
index dce7172..8981ea8 100644
--- a/src/log/tool/benchmark.cpp
+++ b/src/log/tool/benchmark.cpp
@@ -40,8 +40,6 @@
#include "logging/logging.hpp"
-using namespace mesos::log;
-
using namespace process;
using std::cout;
@@ -51,6 +49,8 @@ using std::ofstream;
using std::string;
using std::vector;
+using mesos::log::Log;
+
namespace mesos {
namespace internal {
namespace log {
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/log/tool/replica.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/replica.cpp b/src/log/tool/replica.cpp
index 659c240..e3661df 100644
--- a/src/log/tool/replica.cpp
+++ b/src/log/tool/replica.cpp
@@ -28,10 +28,10 @@
#include "logging/logging.hpp"
-using namespace mesos::log;
-
using namespace process;
+using mesos::log::Log;
+
namespace mesos {
namespace internal {
namespace log {
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index 2823c22..7bbc982 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -79,7 +79,6 @@
using namespace mesos::internal;
using namespace mesos::internal::log;
using namespace mesos::internal::master;
-using namespace mesos::log;
using namespace zookeeper;
using mesos::Authorizer;
@@ -87,6 +86,8 @@ using mesos::MasterInfo;
using mesos::Parameter;
using mesos::Parameters;
+using mesos::log::Log;
+
using mesos::master::allocator::Allocator;
using mesos::master::contender::MasterContender;
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/state/log.cpp
----------------------------------------------------------------------
diff --git a/src/state/log.cpp b/src/state/log.cpp
index ab0c143..2a55913 100644
--- a/src/state/log.cpp
+++ b/src/state/log.cpp
@@ -47,8 +47,6 @@
#include "messages/state.hpp"
-using namespace mesos::log;
-
using namespace mesos::internal::log;
using namespace process;
@@ -58,6 +56,8 @@ using namespace process;
using std::list;
using std::string;
+using mesos::log::Log;
+
using mesos::internal::state::Entry;
using mesos::internal::state::Operation;
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/tests/log_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/log_tests.cpp b/src/tests/log_tests.cpp
index 11a221a..4cd6bc3 100644
--- a/src/tests/log_tests.cpp
+++ b/src/tests/log_tests.cpp
@@ -60,8 +60,6 @@
#include "tests/zookeeper.hpp"
#endif
-using namespace mesos::log;
-
using namespace mesos::internal::log;
using namespace process;
@@ -75,6 +73,8 @@ using testing::Eq;
using testing::Invoke;
using testing::Return;
+using mesos::log::Log;
+
namespace mesos {
namespace internal {
namespace tests {
http://git-wip-us.apache.org/repos/asf/mesos/blob/aecce4dd/src/tests/state_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/state_tests.cpp b/src/tests/state_tests.cpp
index 153fe07..e9f6e85 100644
--- a/src/tests/state_tests.cpp
+++ b/src/tests/state_tests.cpp
@@ -57,8 +57,6 @@
#include "tests/zookeeper.hpp"
#endif
-using namespace mesos::log;
-
using namespace mesos::internal::log;
using namespace process;
@@ -68,9 +66,7 @@ using std::set;
using std::string;
using std::vector;
-namespace mesos {
-namespace internal {
-namespace tests {
+using mesos::log::Log;
using mesos::state::Storage;
using mesos::state::LevelDBStorage;
@@ -81,7 +77,11 @@ using mesos::state::ZooKeeperStorage;
using mesos::state::protobuf::State;
using mesos::state::protobuf::Variable;
-using state::Operation;
+using mesos::internal::state::Operation;
+
+namespace mesos {
+namespace internal {
+namespace tests {
typedef mesos::internal::Registry::Slaves Slaves;
typedef mesos::internal::Registry::Slave Slave;