From 067aba39c8877db69367b04bd05686772ab00554 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Tue, 30 Aug 2022 22:50:23 +0200 Subject: Use const IDocsumEnvironment reference in DocsumFieldWriterFactory. --- streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.cpp | 2 +- streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.h | 2 +- streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp | 2 +- streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h | 2 +- streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'streamingvisitors') diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.cpp index c7ca9b52dc9..35410f3ec67 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.cpp @@ -35,7 +35,7 @@ void populate_fields(MatchingElementsFields& fields, VsmfieldsConfig& fields_con } -DocsumFieldWriterFactory::DocsumFieldWriterFactory(bool use_v8_geo_positions, IDocsumEnvironment& env, const vespa::config::search::vsm::VsmfieldsConfig& vsm_fields_config) +DocsumFieldWriterFactory::DocsumFieldWriterFactory(bool use_v8_geo_positions, const IDocsumEnvironment& env, const vespa::config::search::vsm::VsmfieldsConfig& vsm_fields_config) : search::docsummary::DocsumFieldWriterFactory(use_v8_geo_positions, env), _vsm_fields_config(vsm_fields_config) { diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.h b/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.h index b8362c06f78..c06cb0454b3 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.h +++ b/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.h @@ -16,7 +16,7 @@ class DocsumFieldWriterFactory : public search::docsummary::DocsumFieldWriterFac const vespa::config::search::vsm::VsmfieldsConfig& _vsm_fields_config; public: - DocsumFieldWriterFactory(bool use_v8_geo_positions, search::docsummary::IDocsumEnvironment& env, const vespa::config::search::vsm::VsmfieldsConfig& vsm_fields_config); + DocsumFieldWriterFactory(bool use_v8_geo_positions, const search::docsummary::IDocsumEnvironment& env, const vespa::config::search::vsm::VsmfieldsConfig& vsm_fields_config); ~DocsumFieldWriterFactory() override; std::unique_ptr create_docsum_field_writer(const vespalib::string& fieldName, const vespalib::string& overrideName, const vespalib::string& argument, bool& rc) override; diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp index 7525477fb52..59e56e657be 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp @@ -9,7 +9,7 @@ using vespa::config::search::vsm::VsmfieldsConfig; namespace vsm { -DynamicDocsumConfig::DynamicDocsumConfig(search::docsummary::IDocsumEnvironment& env, search::docsummary::DynamicDocsumWriter* writer, std::shared_ptr vsm_fields_config) +DynamicDocsumConfig::DynamicDocsumConfig(const search::docsummary::IDocsumEnvironment& env, search::docsummary::DynamicDocsumWriter* writer, std::shared_ptr vsm_fields_config) : Parent(env, writer), _vsm_fields_config(std::move(vsm_fields_config)) { diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h index d5b7e258165..760d493dbc1 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h +++ b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h @@ -18,7 +18,7 @@ public: private: std::shared_ptr _vsm_fields_config; public: - DynamicDocsumConfig(search::docsummary::IDocsumEnvironment& env, search::docsummary::DynamicDocsumWriter* writer, std::shared_ptr vsm_fields_config); + DynamicDocsumConfig(const search::docsummary::IDocsumEnvironment& env, search::docsummary::DynamicDocsumWriter* writer, std::shared_ptr vsm_fields_config); private: std::unique_ptr make_docsum_field_writer_factory() override; }; diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h index b8583dc801d..d6c1f55d092 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h @@ -90,7 +90,7 @@ public: // inherit doc from IDocsumEnvironment const search::IAttributeManager * getAttributeManager() const override { return nullptr; } vespalib::string lookupIndex(const vespalib::string&) const override { return ""; } - juniper::Juniper * getJuniper() override { return _juniper.get(); } + const juniper::Juniper * getJuniper() const override { return _juniper.get(); } }; typedef std::shared_ptr DocsumToolsPtr; -- cgit v1.2.3