update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / utilities / merge_operators / put.cc

diff --git a/ceph/src/rocksdb/utilities/merge_operators/put.cc b/ceph/src/rocksdb/utilities/merge_operators/put.cc
index a4b135fef5fa05d9c59cc4004992b71ab73d1080..901d69e945261ab2e5c35a326ae80bf685846699 100644 (file)
--- a/ceph/src/rocksdb/utilities/merge_operators/put.cc
+++ b/ceph/src/rocksdb/utilities/merge_operators/put.cc
@@ -8,7 +8,7 @@
 #include "rocksdb/merge_operator.h"
 #include "utilities/merge_operators.h"
 
-using namespace rocksdb;
+using namespace ROCKSDB_NAMESPACE;
 
 namespace { // anonymous namespace
 
@@ -71,7 +71,7 @@ class PutOperatorV2 : public PutOperator {
 
 } // end of anonymous namespace
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 std::shared_ptr<MergeOperator> MergeOperators::CreateDeprecatedPutOperator() {
   return std::make_shared<PutOperator>();
@@ -80,4 +80,4 @@ std::shared_ptr<MergeOperator> MergeOperators::CreateDeprecatedPutOperator() {
 std::shared_ptr<MergeOperator> MergeOperators::CreatePutOperator() {
   return std::make_shared<PutOperatorV2>();
 }
-}
+}  // namespace ROCKSDB_NAMESPACE