diff options
| author | Geir Storli <geirst@verizonmedia.com> | 2019-10-03 08:56:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-03 08:56:39 +0200 |
| commit | e184c4f0b001c44f8591b43a1b83fb8ec179002d (patch) | |
| tree | 7cc71fff4ad5bafc0f6f315647fc188782291b68 /searchcore/src | |
| parent | c140d80322a0780b02c173b37c926f4cfb763d71 (diff) | |
| parent | 0ef88ee6ac49813e3f22c2aaaa99ec00ab481ab1 (diff) | |
Merge pull request #10845 from vespa-engine/toregge/pass-struct-field-mapper-to-fill-matching-elements-callback
Change signature of fill_matching_elements to take a const reference to StructFieldMapper
Diffstat (limited to 'searchcore/src')
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp | 2 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp index 5951d07a2cb..9e36e19f5be 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp @@ -213,7 +213,7 @@ DocsumContext::ParseLocation(search::docsummary::GetDocsumsState *state) } std::unique_ptr<MatchingElements> -DocsumContext::fill_matching_elements() +DocsumContext::fill_matching_elements(const StructFieldMapper &) { return std::make_unique<MatchingElements>(); } diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h index 30b5ef16cb1..6bd17ba882d 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h @@ -48,7 +48,7 @@ public: void FillSummaryFeatures(search::docsummary::GetDocsumsState * state, search::docsummary::IDocsumEnvironment * env) override; void FillRankFeatures(search::docsummary::GetDocsumsState * state, search::docsummary::IDocsumEnvironment * env) override; void ParseLocation(search::docsummary::GetDocsumsState * state) override; - std::unique_ptr<search::MatchingElements> fill_matching_elements() override; + std::unique_ptr<search::MatchingElements> fill_matching_elements(const search::StructFieldMapper &struct_field_mapper) override; }; } // namespace proton |