Use pointer to const wordfolder in juniper.

Use reference to const wordfolder in vsm adapter.

4 files changed, 5 insertions, 5 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
index f10ab0010ab..096f9ab4c50 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
@@ -14,7 +14,7 @@ namespace streaming {
 
 __thread SearchEnvironment::EnvMap * SearchEnvironment::_localEnvMap = nullptr;
 
-SearchEnvironment::Env::Env(const config::ConfigUri& configUri, Fast_NormalizeWordFolder& wf)
+SearchEnvironment::Env::Env(const config::ConfigUri& configUri, const Fast_NormalizeWordFolder& wf)
     : _configId(configUri.getConfigId()),
       _configurer(std::make_unique<config::SimpleConfigRetriever>(createKeySet(configUri.getConfigId()), configUri.getContext()), this),
       _vsmAdapter(std::make_unique<VSMAdapter>(_configId, wf)),
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
index 243784ecc51..15a6edd667d 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
@@ -18,7 +18,7 @@ private:
     class Env : public config::SimpleConfigurable {
     public:
         using SP = std::shared_ptr<Env>;
-        Env(const config::ConfigUri& configUri, Fast_NormalizeWordFolder& wf);
+        Env(const config::ConfigUri& configUri, const Fast_NormalizeWordFolder& wf);
         ~Env() override;
         const vsm::VSMAdapter * getVSMAdapter() const { return _vsmAdapter.get(); }
         const RankManager * getRankManager() const { return _rankManager.get(); }
diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
index 88e628242f9..50ee380cac9 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
@@ -174,7 +174,7 @@ VSMConfigSnapshot::VSMConfigSnapshot(const vespalib::string & configId, const co
 { }
 VSMConfigSnapshot::~VSMConfigSnapshot() = default;
 
-VSMAdapter::VSMAdapter(const vespalib::string & configId, Fast_WordFolder & wordFolder)
+VSMAdapter::VSMAdapter(const vespalib::string & configId, const Fast_WordFolder& wordFolder)
     : _configId(configId),
       _wordFolder(wordFolder),
       _fieldsCfg(),
diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
index 06b3b8fd478..2ca627c837b 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
@@ -103,7 +103,7 @@ public:
 class VSMAdapter
 {
 public:
-    VSMAdapter(const vespalib::string & configId, Fast_WordFolder & wordFolder);
+    VSMAdapter(const vespalib::string& configId, const Fast_WordFolder& wordFolder);
     virtual ~VSMAdapter();
 
     VsmfieldsHandle getFieldsConfig() const { return _fieldsCfg.get(); }
@@ -111,7 +111,7 @@ public:
     void configure(const VSMConfigSnapshot & snapshot);
 private:
     const vespalib::string                    _configId;
-    Fast_WordFolder                         & _wordFolder;
+    const Fast_WordFolder&                    _wordFolder;
     vespalib::PtrHolder<VsmfieldsConfig>      _fieldsCfg;
     vespalib::PtrHolder<DocsumTools>          _docsumTools;
     std::unique_ptr<JuniperProperties>        _juniperProps;