update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / db / forward_iterator.h

diff --git a/ceph/src/rocksdb/db/forward_iterator.h b/ceph/src/rocksdb/db/forward_iterator.h
index 146588d961c059057bfbb83c9d615c9f4a962f3e..8c671c75fcde1fc96599a8fde3db76a89d4e7d84 100644 (file)
--- a/ceph/src/rocksdb/db/forward_iterator.h
+++ b/ceph/src/rocksdb/db/forward_iterator.h
@@ -10,14 +10,14 @@
 #include <vector>
 #include <queue>
 
+#include "db/dbformat.h"
+#include "memory/arena.h"
 #include "rocksdb/db.h"
 #include "rocksdb/iterator.h"
 #include "rocksdb/options.h"
-#include "db/dbformat.h"
 #include "table/internal_iterator.h"
-#include "util/arena.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 class DBImpl;
 class Env;
@@ -156,5 +156,5 @@ class ForwardIterator : public InternalIterator {
   Arena arena_;
 };
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 #endif  // ROCKSDB_LITE