update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/rocksdb/table/merger_test.cc b/ceph/src/rocksdb/table/merger_test.cc
index 1b04d065727c7d4cb23d2251c6890e697cd3cdd2..466e0eb4284b3275c72c06bebe248f7e3568a1c3 100644 (file)
--- a/ceph/src/rocksdb/table/merger_test.cc
+++ b/ceph/src/rocksdb/table/merger_test.cc
@@ -7,10 +7,10 @@
 #include <string>
 
 #include "table/merging_iterator.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 MergerTest : public testing::Test {
  public:
@@ -172,7 +172,7 @@ TEST_F(MergerTest, SeekToLastTest) {
   }
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);