update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/rocksdb/utilities/merge_operators/uint64add.cc b/ceph/src/rocksdb/utilities/merge_operators/uint64add.cc
index b998e1b8e4e889e604df6ad2df5aeea3f287a3b0..3ef24092824f04241c90ec2672aaa3e9afe5ed65 100644 (file)
--- a/ceph/src/rocksdb/utilities/merge_operators/uint64add.cc
+++ b/ceph/src/rocksdb/utilities/merge_operators/uint64add.cc
@@ -5,14 +5,14 @@
 
 #include <memory>
 
+#include "logging/logging.h"
 #include "rocksdb/env.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/slice.h"
 #include "util/coding.h"
-#include "util/logging.h"
 #include "utilities/merge_operators.h"
 
-using namespace rocksdb;
+using namespace ROCKSDB_NAMESPACE;
 
 namespace { // anonymous namespace
 
@@ -60,10 +60,10 @@ class UInt64AddOperator : public AssociativeMergeOperator {
 
 }
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 std::shared_ptr<MergeOperator> MergeOperators::CreateUInt64AddOperator() {
   return std::make_shared<UInt64AddOperator>();
 }
 
-}
+}  // namespace ROCKSDB_NAMESPACE