mesos git commit: Removed an instance of using declaration in `fetcher.hpp`.

[mp...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 56cdb455f -> 1d6ea2b9c


Removed an instance of using declaration in `fetcher.hpp`.

Review: https://reviews.apache.org/r/40631


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1d6ea2b9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1d6ea2b9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1d6ea2b9

Branch: refs/heads/master
Commit: 1d6ea2b9cd7e3eea7e3c88d16bf30543ab78a11c
Parents: 56cdb45
Author: Klaus Ma <kl...@gmail.com>
Authored: Fri Dec 4 04:12:51 2015 -0500
Committer: Michael Park <mp...@apache.org>
Committed: Fri Dec 4 04:12:52 2015 -0500

----------------------------------------------------------------------
 src/slave/containerizer/fetcher.cpp | 2 ++
 src/slave/containerizer/fetcher.hpp | 4 +---
 src/tests/fetcher_cache_tests.cpp   | 2 ++
 src/tests/mesos.cpp                 | 2 ++
 src/tests/mesos.hpp                 | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/1d6ea2b9/src/slave/containerizer/fetcher.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/fetcher.cpp b/src/slave/containerizer/fetcher.cpp
index 26df3d5..e479bd3 100644
--- a/src/slave/containerizer/fetcher.cpp
+++ b/src/slave/containerizer/fetcher.cpp
@@ -40,6 +40,8 @@ using std::string;
 using std::transform;
 using std::vector;
 
+using mesos::fetcher::FetcherInfo;
+
 using process::Future;
 using process::Owned;
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/1d6ea2b9/src/slave/containerizer/fetcher.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/fetcher.hpp b/src/slave/containerizer/fetcher.hpp
index 78e7d14..bbdce88 100644
--- a/src/slave/containerizer/fetcher.hpp
+++ b/src/slave/containerizer/fetcher.hpp
@@ -34,8 +34,6 @@
 
 #include "slave/flags.hpp"
 
-using mesos::fetcher::FetcherInfo;
-
 namespace mesos {
 namespace internal {
 namespace slave {
@@ -134,7 +132,7 @@ public:
       const ContainerID& containerId,
       const std::string& sandboxDirectory,
       const Option<std::string>& user,
-      const FetcherInfo& info,
+      const mesos::fetcher::FetcherInfo& info,
       const Flags& flags);
 
   // Best effort attempt to kill the external mesos-fetcher process

http://git-wip-us.apache.org/repos/asf/mesos/blob/1d6ea2b9/src/tests/fetcher_cache_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fetcher_cache_tests.cpp b/src/tests/fetcher_cache_tests.cpp
index fb0b3ba..1fb1e21 100644
--- a/src/tests/fetcher_cache_tests.cpp
+++ b/src/tests/fetcher_cache_tests.cpp
@@ -58,6 +58,8 @@
 #include "tests/flags.hpp"
 #include "tests/mesos.hpp"
 
+using mesos::fetcher::FetcherInfo;
+
 using mesos::internal::master::Master;
 
 using mesos::internal::slave::Slave;

http://git-wip-us.apache.org/repos/asf/mesos/blob/1d6ea2b9/src/tests/mesos.cpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.cpp b/src/tests/mesos.cpp
index d42dab5..a501f04 100644
--- a/src/tests/mesos.cpp
+++ b/src/tests/mesos.cpp
@@ -52,6 +52,8 @@ using std::string;
 using testing::_;
 using testing::Invoke;
 
+using mesos::fetcher::FetcherInfo;
+
 using namespace process;
 
 #ifdef WITH_NETWORK_ISOLATOR

http://git-wip-us.apache.org/repos/asf/mesos/blob/1d6ea2b9/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 8d2d919..2429ac5 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -927,14 +927,14 @@ public:
       const ContainerID& containerId,
       const std::string& sandboxDirectory,
       const Option<std::string>& user,
-      const FetcherInfo& info,
+      const mesos::fetcher::FetcherInfo& info,
       const slave::Flags& flags));
 
   process::Future<Nothing> unmocked_run(
       const ContainerID& containerId,
       const std::string& sandboxDirectory,
       const Option<std::string>& user,
-      const FetcherInfo& info,
+      const mesos::fetcher::FetcherInfo& info,
       const slave::Flags& flags);
 };