diff options
4 files changed, 1 insertions, 7 deletions
diff --git a/searchlib/src/vespa/searchlib/fef/iqueryenvironment.h b/searchlib/src/vespa/searchlib/fef/iqueryenvironment.h index 1aad1c7c034..811e7fd4616 100644 --- a/searchlib/src/vespa/searchlib/fef/iqueryenvironment.h +++ b/searchlib/src/vespa/searchlib/fef/iqueryenvironment.h @@ -58,10 +58,8 @@ public: /** * Obtain the location information associated with this query environment. * - * @return location objects. + * @return pointers to location objects. **/ - // virtual const Location & getLocation() const = 0; - virtual std::vector<const Location *> getAllLocations() const = 0; /** diff --git a/searchlib/src/vespa/searchlib/fef/phrase_splitter_query_env.h b/searchlib/src/vespa/searchlib/fef/phrase_splitter_query_env.h index 995fe25d000..3a8cde99c06 100644 --- a/searchlib/src/vespa/searchlib/fef/phrase_splitter_query_env.h +++ b/searchlib/src/vespa/searchlib/fef/phrase_splitter_query_env.h @@ -73,7 +73,6 @@ public: } const Properties & getProperties() const override { return _queryEnv.getProperties(); } - // const Location & getLocation() const override { return _queryEnv.getLocation(); } std::vector<const Location *> getAllLocations() const override { return _queryEnv.getAllLocations(); } diff --git a/searchlib/src/vespa/searchlib/fef/test/queryenvironment.h b/searchlib/src/vespa/searchlib/fef/test/queryenvironment.h index c04cf6da995..4b9bec1ee68 100644 --- a/searchlib/src/vespa/searchlib/fef/test/queryenvironment.h +++ b/searchlib/src/vespa/searchlib/fef/test/queryenvironment.h @@ -38,7 +38,6 @@ public: const Properties &getProperties() const override { return _properties; } uint32_t getNumTerms() const override { return _terms.size(); } const ITermData *getTerm(uint32_t idx) const override { return idx < _terms.size() ? &_terms[idx] : NULL; } - // const Location & getLocation() const override { return _location; } std::vector<const Location *> getAllLocations() const override { std::vector<const Location *> retval; retval.push_back(&_location); diff --git a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h index afbd0e27caf..e3da5a44167 100644 --- a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h @@ -49,8 +49,6 @@ public: } // inherit documentation - // virtual const search::fef::Location & getLocation() const override { return _location; } - std::vector<const search::fef::Location *> getAllLocations() const override { std::vector<const search::fef::Location *> retval; if (_location.isValid()) { |