update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/rocksdb/utilities/cassandra/merge_operator.h b/ceph/src/rocksdb/utilities/cassandra/merge_operator.h
index 4d02c26de434bb8f3b8bb57a307627eaf0b015ee..b5bf7c520eb646611c7db354fd2dc6f17cb6cdde 100644 (file)
--- a/ceph/src/rocksdb/utilities/cassandra/merge_operator.h
+++ b/ceph/src/rocksdb/utilities/cassandra/merge_operator.h
@@ -7,7 +7,7 @@
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/slice.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 namespace cassandra {
 
 /**
@@ -41,4 +41,4 @@ private:
  size_t operands_limit_;
 };
 } // namespace cassandra
-} // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE