update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / db / dbformat_test.cc

diff --git a/ceph/src/rocksdb/db/dbformat_test.cc b/ceph/src/rocksdb/db/dbformat_test.cc
index 0b16c13f57377769d899555b0f49540acd1b5ac9..a2c67795af1d0c3eb7cc8722afb5e9b1bd4f524f 100644 (file)
--- a/ceph/src/rocksdb/db/dbformat_test.cc
+++ b/ceph/src/rocksdb/db/dbformat_test.cc
@@ -8,10 +8,10 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include "db/dbformat.h"
-#include "util/logging.h"
-#include "util/testharness.h"
+#include "logging/logging.h"
+#include "test_util/testharness.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 static std::string IKey(const std::string& user_key,
                         uint64_t seq,
@@ -199,7 +199,7 @@ TEST_F(FormatTest, RangeTombstoneSerializeEndKey) {
   ASSERT_LT(cmp.Compare(t.SerializeEndKey(), k), 0);
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);