git commit: Fixed compiler error (gcc-4.1.2) in state tests.

[ji...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 89d400629 -> 7f2f049f3


Fixed compiler error (gcc-4.1.2) in state tests.

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


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

Branch: refs/heads/master
Commit: 7f2f049f338a8878e6ee9d69117a7a2c37d65a26
Parents: 89d4006
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Apr 23 12:33:51 2014 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Apr 23 12:48:10 2014 -0700

----------------------------------------------------------------------
 src/tests/state_tests.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/7f2f049f/src/tests/state_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/state_tests.cpp b/src/tests/state_tests.cpp
index 56feb27..0948b9f 100644
--- a/src/tests/state_tests.cpp
+++ b/src/tests/state_tests.cpp
@@ -55,12 +55,10 @@
 
 using namespace mesos;
 using namespace mesos::internal;
+using namespace mesos::internal::log;
 
 using namespace process;
 
-using std::set;
-using std::string;
-
 using state::LevelDBStorage;
 using state::Storage;
 #ifdef MESOS_HAS_JAVA
@@ -473,7 +471,7 @@ protected:
     TemporaryDirectoryTest::SetUp();
 
     // For initializing the replicas.
-    log::tool::Initialize initializer;
+    tool::Initialize initializer;
 
     string path1 = os::getcwd() + "/.log1";
     string path2 = os::getcwd() + "/.log2";
@@ -486,12 +484,12 @@ protected:
 
     // Only create the replica for 'path2' (i.e., the second replica)
     // as the first replica will be created when we create a Log.
-    replica2 = new log::Replica(path2);
+    replica2 = new Replica(path2);
 
     set<UPID> pids;
     pids.insert(replica2->pid());
 
-    log = new log::Log(2, path1, pids);
+    log = new Log(2, path1, pids);
     storage = new state::LogStorage(log);
     state = new State(storage);
   }
@@ -510,8 +508,8 @@ protected:
   state::Storage* storage;
   State* state;
 
-  log::Replica* replica2;
-  log::Log* log;
+  Replica* replica2;
+  Log* log;
 };