update sources to ceph Nautilus 14.2.1

[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 9866e03e07d4be428e2a8742797acc39bd657ad0..dc761e74b200e9b0f3f6c989e766d82822e685ef 100644 (file)
--- a/ceph/src/rocksdb/utilities/merge_operators/uint64add.cc
+++ b/ceph/src/rocksdb/utilities/merge_operators/uint64add.cc
@@ -1,7 +1,7 @@
 // Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
+//  This source code is licensed under both the GPLv2 (found in the
+//  COPYING file in the root directory) and Apache 2.0 License
+//  (found in the LICENSE.Apache file in the root directory).
 
 #include <memory>
 
@@ -20,10 +20,8 @@ namespace { // anonymous namespace
 // Implemented as an AssociativeMergeOperator for simplicity and example.
 class UInt64AddOperator : public AssociativeMergeOperator {
  public:
-  virtual bool Merge(const Slice& key,
-                     const Slice* existing_value,
-                     const Slice& value,
-                     std::string* new_value,
+  virtual bool Merge(const Slice& /*key*/, const Slice* existing_value,
+                     const Slice& value, std::string* new_value,
                      Logger* logger) const override {
     uint64_t orig_value = 0;
     if (existing_value){