update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / util / filelock_test.cc

diff --git a/ceph/src/rocksdb/util/filelock_test.cc b/ceph/src/rocksdb/util/filelock_test.cc
index f8721b5909a3ab5b274ac9bece0a28870059c609..20efd513f4f94ff457ef66d32f5b22332b5c5360 100644 (file)
--- a/ceph/src/rocksdb/util/filelock_test.cc
+++ b/ceph/src/rocksdb/util/filelock_test.cc
@@ -6,22 +6,22 @@
 #include "rocksdb/status.h"
 #include "rocksdb/env.h"
 
-#include <vector>
 #include <fcntl.h>
+#include <vector>
+#include "test_util/testharness.h"
 #include "util/coding.h"
-#include "util/testharness.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 class LockTest : public testing::Test {
  public:
   static LockTest* current_;
   std::string file_;
-  rocksdb::Env* env_;
+  ROCKSDB_NAMESPACE::Env* env_;
 
   LockTest()
       : file_(test::PerThreadDBPath("db_testlock_file")),
-        env_(rocksdb::Env::Default()) {
+        env_(ROCKSDB_NAMESPACE::Env::Default()) {
     current_ = this;
   }
 
@@ -133,7 +133,7 @@ TEST_F(LockTest, LockBySameThread) {
 
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);