update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / memtable / hash_skiplist_rep.cc

diff --git a/ceph/src/rocksdb/memtable/hash_skiplist_rep.cc b/ceph/src/rocksdb/memtable/hash_skiplist_rep.cc
index d02919cd4efc0ce9c47be107d01032d76fbbfeb1..67a2a6c83c49a272c488a68de42d1e4f17856ebf 100644 (file)
--- a/ceph/src/rocksdb/memtable/hash_skiplist_rep.cc
+++ b/ceph/src/rocksdb/memtable/hash_skiplist_rep.cc
@@ -9,16 +9,16 @@
 
 #include <atomic>
 
+#include "db/memtable.h"
+#include "memory/arena.h"
+#include "memtable/skiplist.h"
+#include "port/port.h"
 #include "rocksdb/memtablerep.h"
-#include "util/arena.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
-#include "port/port.h"
 #include "util/murmurhash.h"
-#include "db/memtable.h"
-#include "memtable/skiplist.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 namespace {
 
 class HashSkipListRep : public MemTableRep {
@@ -345,5 +345,5 @@ MemTableRepFactory* NewHashSkipListRepFactory(
       skiplist_branching_factor);
 }
 
-} // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 #endif  // ROCKSDB_LITE