use non-const copy of input in rendezvous

2 files changed, 4 insertions, 4 deletions

diff --git a/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp b/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp
index 517434887ce..3093b3acf0f 100644
--- a/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp
+++ b/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp
@@ -199,14 +199,14 @@ void worker(DocidRangeScheduler &scheduler, const Work &work, size_t thread_id,
 
 //-----------------------------------------------------------------------------
 
-struct RangeChecker : vespalib::Rendezvous<WorkTracker,bool> {
+struct RangeChecker : vespalib::Rendezvous<std::reference_wrapper<const WorkTracker>,bool> {
     size_t docid_limit;
     RangeChecker(size_t num_threads, size_t docid_limit_in)
-        : vespalib::Rendezvous<WorkTracker,bool>(num_threads), docid_limit(docid_limit_in) {}
+        : vespalib::Rendezvous<std::reference_wrapper<const WorkTracker>,bool>(num_threads), docid_limit(docid_limit_in) {}
     virtual void mingle() override {
         std::vector<DocidRange> ranges;
         for (size_t i = 0; i < size(); ++i) {
-            ranges.insert(ranges.end(), in(i).ranges.begin(), in(i).ranges.end());
+            ranges.insert(ranges.end(), in(i).get().ranges.begin(), in(i).get().ranges.end());
         }
         std::sort(ranges.begin(), ranges.end(), [](const auto &a, const auto &b)
                   { return (a.begin < b.begin); });
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.h b/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.h
index e17efd66c78..766c273c21d 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.h
@@ -53,7 +53,7 @@ public:
         return _estimate_match_frequency.rendezvous(matches);
     }
     Hits selectBest(Hits sortedHits) override {
-        return _selectBest.rendezvous(sortedHits);
+        return _selectBest.rendezvous(std::move(sortedHits));
     }
     RangePair rangeCover(const RangePair &ranges) override {
         return _rangeCover.rendezvous(ranges);