update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / utilities / cassandra / format.h

diff --git a/ceph/src/rocksdb/utilities/cassandra/format.h b/ceph/src/rocksdb/utilities/cassandra/format.h
index 09a4923565f59dd078f969af7a7c9c97f78b5d64..3f9b433c71ee0b9a3e2e301065c6890f91ae4366 100644 (file)
--- a/ceph/src/rocksdb/utilities/cassandra/format.h
+++ b/ceph/src/rocksdb/utilities/cassandra/format.h
@@ -56,13 +56,13 @@
 
 #pragma once
 #include <chrono>
-#include <vector>
 #include <memory>
+#include <vector>
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/slice.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 namespace cassandra {
 
 // Identify the type of the column.
@@ -194,4 +194,4 @@ private:
 };
 
 } // namepsace cassandrda
-} // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE