update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / table / cleanable_test.cc

diff --git a/ceph/src/rocksdb/table/cleanable_test.cc b/ceph/src/rocksdb/table/cleanable_test.cc
index f18c33b83998b152496b710544c4c0b74bb95b97..f7d80a39db7ddc6e1a658922678aad3d16d17d63 100644 (file)
--- a/ceph/src/rocksdb/table/cleanable_test.cc
+++ b/ceph/src/rocksdb/table/cleanable_test.cc
@@ -9,10 +9,10 @@
 #include "port/stack_trace.h"
 #include "rocksdb/iostats_context.h"
 #include "rocksdb/perf_context.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 class CleanableTest : public testing::Test {};
 
@@ -268,10 +268,10 @@ TEST_F(CleanableTest, PinnableSlice) {
   }
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {
-  rocksdb::port::InstallStackTraceHandler();
+  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }