diff options
author | Tor Egge <Tor.Egge@yahooinc.com> | 2023-05-05 22:40:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-05 22:40:59 +0200 |
commit | 1d270b30aeb0d1dc5770b59383ba1deabf7673e5 (patch) | |
tree | b04827c3975d56a2e99d14de25d8dae30e9113ad /streamingvisitors/src | |
parent | 2e941138aab0dd089ac993ef40be55322753fbab (diff) | |
parent | ac563a1082aa0acde930f9339fec3a149ce4f46f (diff) |
Merge pull request #26998 from vespa-engine/toregge/change-visitor-factory-make-visitor-environment-member-function-return-typev8.161.74
Change return type for VisitorFactory::makeVisitorEnvironment member …
Diffstat (limited to 'streamingvisitors/src')
-rw-r--r-- | streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp | 4 | ||||
-rw-r--r-- | streamingvisitors/src/vespa/searchvisitor/searchvisitor.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index a7fb80f1749..e81292b4170 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -464,10 +464,10 @@ SearchVisitorFactory::SearchVisitorFactory(const config::ConfigUri & configUri) _configUri(configUri) {} -VisitorEnvironment::UP +std::shared_ptr<VisitorEnvironment> SearchVisitorFactory::makeVisitorEnvironment(StorageComponent&) { - return std::make_unique<SearchEnvironment>(_configUri); + return std::make_shared<SearchEnvironment>(_configUri); } storage::Visitor* diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h index d0684cd4421..24b7bd64aec 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h @@ -490,7 +490,7 @@ private: class SearchVisitorFactory : public storage::VisitorFactory { config::ConfigUri _configUri; - storage::VisitorEnvironment::UP makeVisitorEnvironment(storage::StorageComponent&) override; + std::shared_ptr<storage::VisitorEnvironment> makeVisitorEnvironment(storage::StorageComponent&) override; storage::Visitor* makeVisitor(storage::StorageComponent&, storage::VisitorEnvironment&env, const vdslib::Parameters& params) override; |