summaryrefslogtreecommitdiffstats
path: root/vsm
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:34 +0200
commit5c6fcf8f1fa84dbff2cd202de019b0b60e51909f (patch)
treeb9e77a2d713af4297ee79f6cf1dbbadce27fcca2 /vsm
parente19e4463addfc6f9e556b29c3ad744c3ffd20409 (diff)
add override in vsm module
Diffstat (limited to 'vsm')
-rw-r--r--vsm/src/tests/charbuffer/charbuffer.cpp2
-rw-r--r--vsm/src/tests/docsum/docsum.cpp6
-rw-r--r--vsm/src/tests/document/document.cpp2
-rw-r--r--vsm/src/tests/textutil/textutil.cpp2
-rw-r--r--vsm/src/vespa/vsm/searcher/floatfieldsearcher.h4
-rw-r--r--vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h4
-rw-r--r--vsm/src/vespa/vsm/searcher/intfieldsearcher.h4
-rw-r--r--vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h4
-rw-r--r--vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h4
-rw-r--r--vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h4
-rw-r--r--vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h4
-rw-r--r--vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h4
-rw-r--r--vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h4
13 files changed, 24 insertions, 24 deletions
diff --git a/vsm/src/tests/charbuffer/charbuffer.cpp b/vsm/src/tests/charbuffer/charbuffer.cpp
index 4d4148b6426..e619e840910 100644
--- a/vsm/src/tests/charbuffer/charbuffer.cpp
+++ b/vsm/src/tests/charbuffer/charbuffer.cpp
@@ -10,7 +10,7 @@ class CharBufferTest : public vespalib::TestApp
private:
void test();
public:
- int Main();
+ int Main() override;
};
void
diff --git a/vsm/src/tests/docsum/docsum.cpp b/vsm/src/tests/docsum/docsum.cpp
index 8a1697ab099..cb364c0b65e 100644
--- a/vsm/src/tests/docsum/docsum.cpp
+++ b/vsm/src/tests/docsum/docsum.cpp
@@ -29,14 +29,14 @@ private:
public:
TestDocument(const search::DocumentIdT & docId, size_t numFields) : vsm::Document(docId, numFields), _fields(numFields) {}
- virtual bool setField(FieldIdT fId, document::FieldValue::UP fv) {
+ virtual bool setField(FieldIdT fId, document::FieldValue::UP fv) override {
if (fId < _fields.size()) {
_fields[fId].reset(fv.release());
return true;
}
return false;
}
- virtual const document::FieldValue * getField(FieldIdT fId) const {
+ virtual const document::FieldValue * getField(FieldIdT fId) const override {
if (fId < _fields.size()) {
return _fields[fId].get();
}
@@ -68,7 +68,7 @@ private:
void testDocSumCache();
public:
- int Main();
+ int Main() override;
};
ArrayFieldValue
diff --git a/vsm/src/tests/document/document.cpp b/vsm/src/tests/document/document.cpp
index 12b321f7c80..35ca55826ba 100644
--- a/vsm/src/tests/document/document.cpp
+++ b/vsm/src/tests/document/document.cpp
@@ -16,7 +16,7 @@ private:
void testStorageDocument();
void testStringFieldIdTMap();
public:
- int Main();
+ int Main() override;
};
void
diff --git a/vsm/src/tests/textutil/textutil.cpp b/vsm/src/tests/textutil/textutil.cpp
index 154425e0deb..85aac8bab73 100644
--- a/vsm/src/tests/textutil/textutil.cpp
+++ b/vsm/src/tests/textutil/textutil.cpp
@@ -44,7 +44,7 @@ private:
void test_sse2_foldua();
public:
- int Main();
+ int Main() override;
};
ucs4_t
diff --git a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h b/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h
index 79d8ffe65fe..b39e3a96a85 100644
--- a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h
+++ b/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h
@@ -11,8 +11,8 @@ class FloatFieldSearcherT : public FieldSearcher
{
public:
FloatFieldSearcherT(FieldIdT fId=0);
- virtual void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf);
- virtual void onValue(const document::FieldValue & fv);
+ virtual void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override;
+ virtual void onValue(const document::FieldValue & fv) override;
protected:
class FloatInfo
{
diff --git a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h
index 93550f51f3d..4eb7f6c79b8 100644
--- a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h
+++ b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h
@@ -17,8 +17,8 @@ class FUTF8StrChrFieldSearcher : public UTF8StrChrFieldSearcher
static bool lfoldaa(const char * toFold, size_t sz, char * folded, size_t & unalignedStart);
static bool lfoldua(const char * toFold, size_t sz, char * folded, size_t & alignedStart);
private:
- virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt);
- virtual size_t matchTerms(const FieldRef&, const size_t shortestTerm);
+ virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override;
+ virtual size_t matchTerms(const FieldRef&, const size_t shortestTerm) override;
virtual size_t match(const char *folded, size_t sz, search::QueryTerm & qt);
size_t match(const char *folded, size_t sz, size_t mintsz, search::QueryTerm ** qtl, size_t qtlSize);
std::vector<char> _folded;
diff --git a/vsm/src/vespa/vsm/searcher/intfieldsearcher.h b/vsm/src/vespa/vsm/searcher/intfieldsearcher.h
index 42e3c1557f5..f023c5b39f2 100644
--- a/vsm/src/vespa/vsm/searcher/intfieldsearcher.h
+++ b/vsm/src/vespa/vsm/searcher/intfieldsearcher.h
@@ -11,8 +11,8 @@ class IntFieldSearcher : public FieldSearcher
public:
DUPLICATE(IntFieldSearcher);
IntFieldSearcher(FieldIdT fId=0);
- virtual void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf);
- virtual void onValue(const document::FieldValue & fv);
+ virtual void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override;
+ virtual void onValue(const document::FieldValue & fv) override;
protected:
class IntInfo
{
diff --git a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h b/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h
index 3446fffd821..a7c4cbcce7a 100644
--- a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h
+++ b/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h
@@ -11,8 +11,8 @@ class StrChrFieldSearcher : public FieldSearcher
public:
StrChrFieldSearcher() : FieldSearcher(0) { }
StrChrFieldSearcher(FieldIdT fId) : FieldSearcher(fId) { }
- virtual void onValue(const document::FieldValue & fv);
- virtual void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf);
+ virtual void onValue(const document::FieldValue & fv) override;
+ virtual void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override;
private:
size_t shortestTerm() const;
bool matchDoc(const FieldRef & field);
diff --git a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h
index 1fa1a23a938..8c92b0b281d 100644
--- a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h
+++ b/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h
@@ -12,8 +12,8 @@ namespace vsm
class UTF8ExactStringFieldSearcher : public UTF8StringFieldSearcherBase
{
protected:
- virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt);
- virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm);
+ virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override;
+ virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override;
public:
DUPLICATE(UTF8ExactStringFieldSearcher);
diff --git a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h
index 677e9e48ba6..730c7bcdb83 100644
--- a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h
+++ b/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h
@@ -17,13 +17,13 @@ private:
* Tries to match the given query term against the content of the given field reference.
* Search strategy is choosen based on the query term type.
**/
- virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt);
+ virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override;
/**
* Tries to match each query term in the underlying query against the content of the given field reference.
* Search strategy is choosen based on the query term type.
**/
- virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm);
+ virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override;
public:
DUPLICATE(UTF8FlexibleStringFieldSearcher);
diff --git a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h
index de49483524d..f6ba0d76e96 100644
--- a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h
+++ b/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h
@@ -17,8 +17,8 @@ public:
UTF8StrChrFieldSearcher(FieldIdT fId) : UTF8StringFieldSearcherBase(fId) { }
protected:
- virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt);
- virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm);
+ virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override;
+ virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override;
};
}
diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h b/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h
index a734e6356c3..c77c8b7d824 100644
--- a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h
+++ b/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h
@@ -24,8 +24,8 @@ private:
const char * _readPtr; // buffer to read from (field reference)
char _unitSep; // the unit separator character to use
- virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt);
- virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm);
+ virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override;
+ virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override;
/**
* Copies n bytes from the field reference to the modified buffer and updates the read pointer.
diff --git a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h
index 5fafa027985..d66df1248d0 100644
--- a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h
+++ b/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h
@@ -12,8 +12,8 @@ namespace vsm
class UTF8SuffixStringFieldSearcher : public UTF8StringFieldSearcherBase
{
protected:
- virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt);
- virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm);
+ virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override;
+ virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override;
public:
DUPLICATE(UTF8SuffixStringFieldSearcher);