update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / table / merging_iterator.h

diff --git a/ceph/src/rocksdb/table/merging_iterator.h b/ceph/src/rocksdb/table/merging_iterator.h
index 21ff79bf6b47b5b75d5ead0fa17fcafa8ce7f2b1..c4429bf582b08146002c3f6070c1bc432d48d696 100644 (file)
--- a/ceph/src/rocksdb/table/merging_iterator.h
+++ b/ceph/src/rocksdb/table/merging_iterator.h
@@ -12,7 +12,7 @@
 #include "db/dbformat.h"
 #include "rocksdb/types.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 class Comparator;
 class Env;
@@ -61,4 +61,4 @@ class MergeIteratorBuilder {
   Arena* arena;
 };
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE