summaryrefslogtreecommitdiffstats
path: root/streamingvisitors/src
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-04-12 11:52:54 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-04-12 12:35:33 +0200
commite19e4463addfc6f9e556b29c3ad744c3ffd20409 (patch)
tree0c76e018d0f17e64d666e6aba7b999c35adcaedc /streamingvisitors/src
parentfdfe587b34359cf8eb990eb9f87de20d708507ba (diff)
add override in streamingvisitors module
Diffstat (limited to 'streamingvisitors/src')
-rw-r--r--streamingvisitors/src/tests/hitcollector/hitcollector.cpp2
-rw-r--r--streamingvisitors/src/tests/querywrapper/querywrapper.cpp2
-rw-r--r--streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp2
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/hitcollector.h2
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/queryenvironment.h12
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/searchenvironment.h2
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp2
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/searchvisitor.h10
8 files changed, 17 insertions, 17 deletions
diff --git a/streamingvisitors/src/tests/hitcollector/hitcollector.cpp b/streamingvisitors/src/tests/hitcollector/hitcollector.cpp
index 8105da3d0c8..ba37da9e511 100644
--- a/streamingvisitors/src/tests/hitcollector/hitcollector.cpp
+++ b/streamingvisitors/src/tests/hitcollector/hitcollector.cpp
@@ -33,7 +33,7 @@ private:
public:
HitCollectorTest();
- int Main();
+ int Main() override;
};
HitCollectorTest::HitCollectorTest()
diff --git a/streamingvisitors/src/tests/querywrapper/querywrapper.cpp b/streamingvisitors/src/tests/querywrapper/querywrapper.cpp
index 46fb90a51e8..226e1eecb17 100644
--- a/streamingvisitors/src/tests/querywrapper/querywrapper.cpp
+++ b/streamingvisitors/src/tests/querywrapper/querywrapper.cpp
@@ -18,7 +18,7 @@ private:
void testQueryWrapper();
public:
- int Main();
+ int Main() override;
};
void
diff --git a/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp
index 66b7743c3b3..6081b5c3ac2 100644
--- a/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp
@@ -29,7 +29,7 @@ private:
public:
SearchVisitorTest();
- int Main();
+ int Main() override;
};
SearchVisitorTest::SearchVisitorTest() :
diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.h b/streamingvisitors/src/vespa/searchvisitor/hitcollector.h
index 12503640cbb..b51ad7da82d 100644
--- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.h
+++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.h
@@ -87,7 +87,7 @@ public:
HitCollector(size_t wantedHits);
- virtual const vsm::Document & getDocSum(const search::DocumentIdT & docId) const;
+ virtual const vsm::Document & getDocSum(const search::DocumentIdT & docId) const override;
/**
* Adds a hit to this hit collector.
diff --git a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h
index 05ddcba92d3..ffe292939d7 100644
--- a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h
+++ b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h
@@ -35,13 +35,13 @@ public:
~QueryEnvironment();
// inherit documentation
- virtual const search::fef::Properties & getProperties() const { return _properties; }
+ virtual const search::fef::Properties & getProperties() const override { return _properties; }
// inherit documentation
- virtual uint32_t getNumTerms() const { return _queryTerms.size(); }
+ virtual uint32_t getNumTerms() const override { return _queryTerms.size(); }
// inherit documentation
- virtual const search::fef::ITermData *getTerm(uint32_t idx) const {
+ virtual const search::fef::ITermData *getTerm(uint32_t idx) const override {
if (idx >= _queryTerms.size()) {
return NULL;
}
@@ -49,13 +49,13 @@ public:
}
// inherit documentation
- virtual const search::fef::Location & getLocation() const { return _location; }
+ virtual const search::fef::Location & getLocation() const override { return _location; }
// inherit documentation
- virtual const search::attribute::IAttributeContext & getAttributeContext() const { return *_attrCtx; }
+ virtual const search::attribute::IAttributeContext & getAttributeContext() const override { return *_attrCtx; }
// inherit documentation
- virtual const search::fef::IIndexEnvironment & getIndexEnvironment() const { return _indexEnv; }
+ virtual const search::fef::IIndexEnvironment & getIndexEnvironment() const override { return _indexEnv; }
void addTerm(const search::fef::ITermData *term) { _queryTerms.push_back(term); }
};
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
index 0da6495bb05..5fb4c2444c6 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
@@ -22,7 +22,7 @@ private:
~Env();
const vsm::VSMAdapter * getVSMAdapter() const { return _vsmAdapter.get(); }
const RankManager * getRankManager() const { return _rankManager.get(); }
- void configure(const config::ConfigSnapshot & snapshot);
+ void configure(const config::ConfigSnapshot & snapshot) override;
static config::ConfigKeySet createKeySet(const vespalib::string & configId);
private:
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index 287f640ad63..90b3f58991c 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -845,7 +845,7 @@ class SingleDocumentStore : public vsm::IDocSumCache
{
public:
SingleDocumentStore(const StorageDocument & doc) : _doc(doc) { }
- virtual const vsm::Document & getDocSum(const search::DocumentIdT & docId) const {
+ virtual const vsm::Document & getDocSum(const search::DocumentIdT & docId) const override {
(void) docId;
return _doc;
}
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
index 9e4d5a11767..7767a601ea4 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
@@ -393,7 +393,7 @@ private:
void setFilter(std::unique_ptr<vsm::DocsumFilter> filter) { _docsumFilter = std::move(filter); }
void setDocsumCache(const vsm::IDocSumCache & cache) { _docsumFilter->setDocSumStore(cache); }
void setDocsumWriter(IDocsumWriter & docsumWriter) { _docsumWriter = & docsumWriter; }
- virtual vespalib::ConstBufferRef fillSummary(search::AttributeVector::DocId lid, const HitsAggregationResult::SummaryClassType & summaryClass);
+ virtual vespalib::ConstBufferRef fillSummary(search::AttributeVector::DocId lid, const HitsAggregationResult::SummaryClassType & summaryClass) override;
private:
vsm::GetDocsumsStateCallback _callback;
GetDocsumsState _docsumState;
@@ -411,8 +411,8 @@ private:
{ }
size_t getNumHitsAggregators() const { return _numHitsAggregators; }
private:
- virtual void execute(vespalib::Identifiable &obj);
- virtual bool check(const vespalib::Identifiable &obj) const;
+ virtual void execute(vespalib::Identifiable &obj) override;
+ virtual bool check(const vespalib::Identifiable &obj) const override;
SummaryGenerator & _summaryGenerator;
size_t _numHitsAggregators;
};
@@ -457,10 +457,10 @@ private:
class SearchVisitorFactory : public VisitorFactory {
config::ConfigUri _configUri;
- VisitorEnvironment::UP makeVisitorEnvironment(StorageComponent&);
+ VisitorEnvironment::UP makeVisitorEnvironment(StorageComponent&) override;
Visitor* makeVisitor(StorageComponent&, VisitorEnvironment&env,
- const vdslib::Parameters& params);
+ const vdslib::Parameters& params) override;
public:
SearchVisitorFactory(const config::ConfigUri & configUri);
};