update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/rocksdb/table/sst_file_reader_test.cc b/ceph/src/rocksdb/table/sst_file_reader_test.cc
index 51bc975af0025bdf2c133a50abd5f4f8d04afa5f..ac020a3ec218234bcc98d587acfd7b2dcbd79212 100644 (file)
--- a/ceph/src/rocksdb/table/sst_file_reader_test.cc
+++ b/ceph/src/rocksdb/table/sst_file_reader_test.cc
@@ -5,17 +5,17 @@
 
 #ifndef ROCKSDB_LITE
 
-#include <inttypes.h>
+#include <cinttypes>
 
 #include "rocksdb/db.h"
 #include "rocksdb/sst_file_reader.h"
 #include "rocksdb/sst_file_writer.h"
 #include "table/sst_file_writer_collectors.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 #include "utilities/merge_operators.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 std::string EncodeAsString(uint64_t v) {
   char buf[16];
@@ -155,7 +155,7 @@ TEST_F(SstFileReaderTest, ReadFileWithGlobalSeqno) {
   ASSERT_OK(DestroyDB(db_name, options));
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);