From 76387ab6b013bdeacf79247a61bc5fda032075ee Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 28 Nov 2017 16:16:09 +1300 Subject: [PATCH] Rename Collapser::entries() to get_entries() --- xapian-core/matcher/collapser.h | 2 +- xapian-core/matcher/multimatch.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xapian-core/matcher/collapser.h b/xapian-core/matcher/collapser.h index ffbff7d9c..3439fa9f2 100644 --- a/xapian-core/matcher/collapser.h +++ b/xapian-core/matcher/collapser.h @@ -150,7 +150,7 @@ class Collapser { Xapian::doccount get_dups_ignored() const { return dups_ignored; } - Xapian::doccount entries() const { return entry_count; } + Xapian::doccount get_entries() const { return entry_count; } Xapian::doccount get_matches_lower_bound() const; diff --git a/xapian-core/matcher/multimatch.cc b/xapian-core/matcher/multimatch.cc index 5813f793c..d96996f9f 100644 --- a/xapian-core/matcher/multimatch.cc +++ b/xapian-core/matcher/multimatch.cc @@ -894,7 +894,7 @@ new_greatest_weight: double min_wt = 0.0; if (percent_scale > 0.0) min_wt = percent_cutoff_factor / percent_scale; - Xapian::doccount entries = collapser.entries(); + Xapian::doccount entries = collapser.get_entries(); vector::iterator i; for (i = items.begin(); i != items.end(); ++i) { // Skip entries without a collapse key. -- 2.11.4.GIT