import 14.2.4 nautilus point release

[ceph.git] / ceph / src / rocksdb / db / merge_helper.h

diff --git a/ceph/src/rocksdb/db/merge_helper.h b/ceph/src/rocksdb/db/merge_helper.h
index 993bbe3e9de189b1987a99283c450098ea6c1697..670cba5983b6034184b21c6594178c9b6656f922 100644 (file)
--- a/ceph/src/rocksdb/db/merge_helper.h
+++ b/ceph/src/rocksdb/db/merge_helper.h
@@ -78,7 +78,7 @@ class MergeHelper {
   //
   // REQUIRED: The first key in the input is not corrupted.
   Status MergeUntil(InternalIterator* iter,
-                    RangeDelAggregator* range_del_agg = nullptr,
+                    CompactionRangeDelAggregator* range_del_agg = nullptr,
                     const SequenceNumber stop_before = 0,
                     const bool at_bottom = false);