update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/rocksdb/utilities/cassandra/merge_operator.cc b/ceph/src/rocksdb/utilities/cassandra/merge_operator.cc
index 4e529a6f2a88b18358fc7a71f1b4cd0f857fca30..82fe5d6614213ae27b0070942c8ce5a8cb8ca275 100644 (file)
--- a/ceph/src/rocksdb/utilities/cassandra/merge_operator.cc
+++ b/ceph/src/rocksdb/utilities/cassandra/merge_operator.cc
@@ -13,7 +13,7 @@
 #include "utilities/merge_operators.h"
 #include "utilities/cassandra/format.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 namespace cassandra {
 
 // Implementation for the merge operation (merges two Cassandra values)
@@ -64,4 +64,4 @@ const char* CassandraValueMergeOperator::Name() const  {
 
 } // namespace cassandra
 
-} // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE