No _ prefix for public members.

3 files changed, 35 insertions, 35 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp
index 9834432fecd..5e965084a2d 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp
@@ -70,11 +70,11 @@ LimitedSearch::visitMembers(vespalib::ObjectVisitor &visitor) const
 MatchPhaseLimiter::MatchPhaseLimiter(uint32_t docIdLimit, Searchable &searchable_attributes,
                                      IRequestContext & requestContext,
                                      DegradationParams degradation, DiversityParams diversity)
-    : _postFilterMultiplier(degradation._post_filter_multiplier),
-      _maxFilterCoverage(degradation._max_filter_coverage),
-      _calculator(degradation._max_hits, diversity._min_groups, degradation._sample_percentage),
-      _limiter_factory(searchable_attributes, requestContext, degradation._attribute, degradation._descending,
-                       diversity._attribute, diversity._cutoff_factor, diversity._cutoff_strategy),
+    : _postFilterMultiplier(degradation.post_filter_multiplier),
+      _maxFilterCoverage(degradation.max_filter_coverage),
+      _calculator(degradation.max_hits, diversity.min_groups, degradation.sample_percentage),
+      _limiter_factory(searchable_attributes, requestContext, degradation.attribute, degradation.descending,
+                       diversity.attribute, diversity.cutoff_factor, diversity.cutoff_strategy),
       _coverage(docIdLimit)
 { }
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.h b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.h
index d97d673de72..6249f87a9fb 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.h
@@ -71,36 +71,36 @@ struct NoMatchPhaseLimiter : MaybeMatchPhaseLimiter {
 struct DiversityParams {
     using CutoffStrategy = AttributeLimiter::DiversityCutoffStrategy;
     DiversityParams() : DiversityParams("", 0, 0, CutoffStrategy::LOOSE) { }
-    DiversityParams(const vespalib::string & attribute, uint32_t min_groups,
-                    double cutoff_factor, CutoffStrategy cutoff_strategy)
-        : _attribute(attribute),
-          _min_groups(min_groups),
-          _cutoff_factor(cutoff_factor),
-          _cutoff_strategy(cutoff_strategy)
+    DiversityParams(const vespalib::string & attribute_, uint32_t min_groups_,
+                    double cutoff_factor_, CutoffStrategy cutoff_strategy_)
+        : attribute(attribute_),
+          min_groups(min_groups_),
+          cutoff_factor(cutoff_factor_),
+          cutoff_strategy(cutoff_strategy_)
     { }
 
-    vespalib::string  _attribute;
-    uint32_t          _min_groups;
-    double            _cutoff_factor;
-    CutoffStrategy    _cutoff_strategy;
+    vespalib::string  attribute;
+    uint32_t          min_groups;
+    double            cutoff_factor;
+    CutoffStrategy    cutoff_strategy;
 };
 
 struct DegradationParams {
-    DegradationParams(const vespalib::string &attribute, size_t max_hits, bool descending, double max_filter_coverage,
-                      double sample_percentage, double post_filter_multiplier)
-        : _attribute(attribute),
-          _max_hits(max_hits),
-          _descending(descending),
-          _max_filter_coverage(max_filter_coverage),
-          _sample_percentage(sample_percentage),
-          _post_filter_multiplier(post_filter_multiplier)
+    DegradationParams(const vespalib::string &attribute_, size_t max_hits_, bool descending_,
+                      double max_filter_coverage_, double sample_percentage_, double post_filter_multiplier_)
+        : attribute(attribute_),
+          max_hits(max_hits_),
+          descending(descending_),
+          max_filter_coverage(max_filter_coverage_),
+          sample_percentage(sample_percentage_),
+          post_filter_multiplier(post_filter_multiplier_)
     { }
-    vespalib::string _attribute;
-    size_t           _max_hits;
-    bool             _descending;
-    double           _max_filter_coverage;
-    double           _sample_percentage;
-    double           _post_filter_multiplier;
+    vespalib::string attribute;
+    size_t           max_hits;
+    bool             descending;
+    double           max_filter_coverage;
+    double           sample_percentage;
+    double           post_filter_multiplier;
 };
 
 /**
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
index e98d5789b5e..faf0156ad25 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
@@ -214,17 +214,17 @@ MatchToolsFactory::createMatchTools() const
 
 std::unique_ptr<IDiversifier> MatchToolsFactory::createDiversifier() const
 {
-    if (_diversityParams._attribute.empty()) {
+    if (_diversityParams.attribute.empty()) {
         return std::unique_ptr<IDiversifier>();
     }
-    auto attr = _requestContext.getAttribute(_diversityParams._attribute);
+    auto attr = _requestContext.getAttribute(_diversityParams.attribute);
     if ( !attr) {
-        LOG(warning, "Skipping diversity due to no %s attribute.", _diversityParams._attribute.c_str());
+        LOG(warning, "Skipping diversity due to no %s attribute.", _diversityParams.attribute.c_str());
         return std::unique_ptr<IDiversifier>();
     }
-    size_t max_per_group = _rankSetup.getHeapSize()/_diversityParams._min_groups;
-    return DiversityFilter::create(*attr, _rankSetup.getHeapSize(), max_per_group, _diversityParams._min_groups,
-                                   _diversityParams._cutoff_strategy == DiversityParams::CutoffStrategy::STRICT);
+    size_t max_per_group = _rankSetup.getHeapSize()/_diversityParams.min_groups;
+    return DiversityFilter::create(*attr, _rankSetup.getHeapSize(), max_per_group, _diversityParams.min_groups,
+                                   _diversityParams.cutoff_strategy == DiversityParams::CutoffStrategy::STRICT);
 }
 
 }