update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/rocksdb/db/merge_helper.h b/ceph/src/rocksdb/db/merge_helper.h
index 670cba5983b6034184b21c6594178c9b6656f922..c0534f08ba4eec20db5e239a664caea2597f822f 100644 (file)
--- a/ceph/src/rocksdb/db/merge_helper.h
+++ b/ceph/src/rocksdb/db/merge_helper.h
@@ -18,7 +18,7 @@
 #include "rocksdb/slice.h"
 #include "util/stop_watch.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 class Comparator;
 class Iterator;
@@ -191,4 +191,4 @@ class MergeOutputIterator {
   std::vector<Slice>::const_reverse_iterator it_values_;
 };
 
-} // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE