summaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-04-10 15:57:12 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-04-10 15:57:12 +0200
commitff25d69b1164bcc39a218e24545f8974c87b3501 (patch)
treebba962ec896caaee0f5e70aba43191e417809d77 /document
parent7408511082d6f1faf777a9039004fe8002a67acb (diff)
add override in document module
Diffstat (limited to 'document')
-rw-r--r--document/src/tests/arrayfieldvaluetest.cpp4
-rw-r--r--document/src/tests/documentcalculatortestcase.cpp4
-rw-r--r--document/src/tests/documentselectparsertest.cpp42
-rw-r--r--document/src/tests/documenttestcase.cpp4
-rw-r--r--document/src/tests/documenttypetestcase.cpp4
-rw-r--r--document/src/tests/documentupdatetestcase.cpp4
-rw-r--r--document/src/tests/fieldpathupdatetestcase.cpp14
-rw-r--r--document/src/tests/primitivefieldvaluetest.cpp4
-rw-r--r--document/src/tests/serialization/annotationserializer_test.cpp2
-rw-r--r--document/src/tests/struct_anno/struct_anno_test.cpp2
-rw-r--r--document/src/tests/structfieldvaluetest.cpp4
-rw-r--r--document/src/tests/testbytebuffer.h2
-rw-r--r--document/src/tests/teststringutil.h2
-rw-r--r--document/src/tests/weightedsetfieldvaluetest.cpp4
14 files changed, 48 insertions, 48 deletions
diff --git a/document/src/tests/arrayfieldvaluetest.cpp b/document/src/tests/arrayfieldvaluetest.cpp
index 136129274b5..85659c0cbb4 100644
--- a/document/src/tests/arrayfieldvaluetest.cpp
+++ b/document/src/tests/arrayfieldvaluetest.cpp
@@ -11,8 +11,8 @@ using vespalib::nbostream;
namespace document {
struct ArrayFieldValueTest : public CppUnit::TestFixture {
- void setUp() {}
- void tearDown() {}
+ void setUp() override {}
+ void tearDown() override {}
void testArray();
diff --git a/document/src/tests/documentcalculatortestcase.cpp b/document/src/tests/documentcalculatortestcase.cpp
index 357f6db0cfc..a292302ad61 100644
--- a/document/src/tests/documentcalculatortestcase.cpp
+++ b/document/src/tests/documentcalculatortestcase.cpp
@@ -19,8 +19,8 @@ class DocumentCalculatorTest : public CppUnit::TestFixture {
public:
const DocumentTypeRepo &getRepo() { return _testRepo.getTypeRepo(); }
- void setUp() {}
- void tearDown() {}
+ void setUp() override {}
+ void tearDown() override {}
void testConstant();
void testSimple();
diff --git a/document/src/tests/documentselectparsertest.cpp b/document/src/tests/documentselectparsertest.cpp
index f8e99e9cd66..8e17dd12e12 100644
--- a/document/src/tests/documentselectparsertest.cpp
+++ b/document/src/tests/documentselectparsertest.cpp
@@ -65,8 +65,8 @@ public:
DocumentSelectParserTest()
: _bucketIdFactory() {}
- void setUp();
- void tearDown() {}
+ void setUp() override;
+ void tearDown() override {}
void createDocs();
void testParseTerminals();
@@ -914,29 +914,29 @@ namespace {
public:
virtual ~TestVisitor() {}
- void visitConstant(const select::Constant& node)
+ void visitConstant(const select::Constant& node) override
{
data << "CONSTANT(" << node << ")";
}
virtual void
- visitInvalidConstant(const select::InvalidConstant& node)
+ visitInvalidConstant(const select::InvalidConstant& node) override
{
data << "INVALIDCONSTANT(" << node << ")";
}
- void visitDocumentType(const select::DocType& node)
+ void visitDocumentType(const select::DocType& node) override
{
data << "DOCTYPE(" << node << ")";
}
- void visitComparison(const select::Compare& node)
+ void visitComparison(const select::Compare& node) override
{
data << "COMPARE(" << node.getLeft() << " "
<< node.getOperator() << " " << node.getRight() << ")";
}
- void visitAndBranch(const select::And& node)
+ void visitAndBranch(const select::And& node) override
{
data << "AND(";
node.getLeft().visit(*this);
@@ -945,7 +945,7 @@ namespace {
data << ")";
}
- void visitOrBranch(const select::Or& node)
+ void visitOrBranch(const select::Or& node) override
{
data << "OR(";
node.getLeft().visit(*this);
@@ -954,7 +954,7 @@ namespace {
data << ")";
}
- void visitNotBranch(const select::Not& node)
+ void visitNotBranch(const select::Not& node) override
{
data << "NOT(";
node.getChild().visit(*this);
@@ -962,62 +962,62 @@ namespace {
}
virtual void
- visitArithmeticValueNode(const select::ArithmeticValueNode &)
+ visitArithmeticValueNode(const select::ArithmeticValueNode &) override
{
}
virtual void
- visitFunctionValueNode(const select::FunctionValueNode &)
+ visitFunctionValueNode(const select::FunctionValueNode &) override
{
}
virtual void
- visitIdValueNode(const select::IdValueNode &)
+ visitIdValueNode(const select::IdValueNode &) override
{
}
virtual void
- visitSearchColumnValueNode(const select::SearchColumnValueNode &)
+ visitSearchColumnValueNode(const select::SearchColumnValueNode &) override
{
}
virtual void
- visitFieldValueNode(const select::FieldValueNode &)
+ visitFieldValueNode(const select::FieldValueNode &) override
{
}
virtual void
- visitFloatValueNode(const select::FloatValueNode &)
+ visitFloatValueNode(const select::FloatValueNode &) override
{
}
virtual void
- visitVariableValueNode(const select::VariableValueNode &)
+ visitVariableValueNode(const select::VariableValueNode &) override
{
}
virtual void
- visitIntegerValueNode(const select::IntegerValueNode &)
+ visitIntegerValueNode(const select::IntegerValueNode &) override
{
}
virtual void
- visitCurrentTimeValueNode(const select::CurrentTimeValueNode &)
+ visitCurrentTimeValueNode(const select::CurrentTimeValueNode &) override
{
}
virtual void
- visitStringValueNode(const select::StringValueNode &)
+ visitStringValueNode(const select::StringValueNode &) override
{
}
virtual void
- visitNullValueNode(const select::NullValueNode &)
+ visitNullValueNode(const select::NullValueNode &) override
{
}
virtual void
- visitInvalidValueNode(const select::InvalidValueNode &)
+ visitInvalidValueNode(const select::InvalidValueNode &) override
{
}
diff --git a/document/src/tests/documenttestcase.cpp b/document/src/tests/documenttestcase.cpp
index 8a6cb193aad..d9b188278fd 100644
--- a/document/src/tests/documenttestcase.cpp
+++ b/document/src/tests/documenttestcase.cpp
@@ -269,7 +269,7 @@ DocumentTest::testVariables()
class ModifyIteratorHandler : public FieldValue::IteratorHandler {
public:
- ModificationStatus doModify(FieldValue& fv) {
+ ModificationStatus doModify(FieldValue& fv) override {
StringFieldValue* sfv = dynamic_cast<StringFieldValue*>(&fv);
if (sfv != NULL) {
*sfv = std::string("newvalue");
@@ -279,7 +279,7 @@ public:
return NOT_MODIFIED;
};
- bool onComplex(const Content&) {
+ bool onComplex(const Content&) override {
return false;
}
};
diff --git a/document/src/tests/documenttypetestcase.cpp b/document/src/tests/documenttypetestcase.cpp
index b2aeccdf8de..c7856ff9cf5 100644
--- a/document/src/tests/documenttypetestcase.cpp
+++ b/document/src/tests/documenttypetestcase.cpp
@@ -16,8 +16,8 @@ using document::config_builder::Map;
namespace document {
struct DocumentTypeTest : public CppUnit::TestFixture {
- void setUp();
- void tearDown();
+ void setUp() override;
+ void tearDown() override;
void testSetGet();
void testHeaderContent();
diff --git a/document/src/tests/documentupdatetestcase.cpp b/document/src/tests/documentupdatetestcase.cpp
index f0784bf2ba7..5ac7c48c7ad 100644
--- a/document/src/tests/documentupdatetestcase.cpp
+++ b/document/src/tests/documentupdatetestcase.cpp
@@ -33,8 +33,8 @@ using vespalib::tensor::TensorDimensions;
namespace document {
struct DocumentUpdateTest : public CppUnit::TestFixture {
- void setUp() {}
- void tearDown() {}
+ void setUp() override {}
+ void tearDown() override {}
void testSimpleUsage();
void testUpdateApplySingleValue();
diff --git a/document/src/tests/fieldpathupdatetestcase.cpp b/document/src/tests/fieldpathupdatetestcase.cpp
index 991c1d6b908..4a23f828921 100644
--- a/document/src/tests/fieldpathupdatetestcase.cpp
+++ b/document/src/tests/fieldpathupdatetestcase.cpp
@@ -25,8 +25,8 @@ struct FieldPathUpdateTestCase : public CppUnit::TestFixture {
DocumentTypeRepo::SP _repo;
DocumentType _foobar_type;
- void setUp();
- void tearDown();
+ void setUp() override;
+ void tearDown() override;
void testWhereClause();
void testNoIterateMapValues();
@@ -264,7 +264,7 @@ struct TestFieldPathUpdate : FieldPathUpdate
TestIteratorHandler(std::string& str)
: _str(str) {}
- ModificationStatus doModify(FieldValue& value)
+ ModificationStatus doModify(FieldValue& value) override
{
std::ostringstream ss;
value.print(ss, false, "");
@@ -275,7 +275,7 @@ struct TestFieldPathUpdate : FieldPathUpdate
return NOT_MODIFIED;
}
- bool onComplex(const Content&) { return false; }
+ bool onComplex(const Content&) override { return false; }
std::string& _str;
};
@@ -288,15 +288,15 @@ struct TestFieldPathUpdate : FieldPathUpdate
TestFieldPathUpdate(const TestFieldPathUpdate& other);
- std::unique_ptr<FieldValue::IteratorHandler> getIteratorHandler(Document&) const
+ std::unique_ptr<FieldValue::IteratorHandler> getIteratorHandler(Document&) const override
{
return std::unique_ptr<FieldValue::IteratorHandler>(
new TestIteratorHandler(_str));
}
- TestFieldPathUpdate* clone() const { return new TestFieldPathUpdate(*this); }
+ TestFieldPathUpdate* clone() const override { return new TestFieldPathUpdate(*this); }
- void print(std::ostream& out, bool, const std::string&) const
+ void print(std::ostream& out, bool, const std::string&) const override
{
out << "TestFieldPathUpdate()";
}
diff --git a/document/src/tests/primitivefieldvaluetest.cpp b/document/src/tests/primitivefieldvaluetest.cpp
index 90e51ec071d..ba81e0ebbf6 100644
--- a/document/src/tests/primitivefieldvaluetest.cpp
+++ b/document/src/tests/primitivefieldvaluetest.cpp
@@ -11,8 +11,8 @@ using vespalib::nbostream;
namespace document {
struct PrimitiveFieldValueTest : public CppUnit::TestFixture {
- void setUp() {}
- void tearDown() {}
+ void setUp() override {}
+ void tearDown() override {}
void testLiterals();
void testRaw();
diff --git a/document/src/tests/serialization/annotationserializer_test.cpp b/document/src/tests/serialization/annotationserializer_test.cpp
index 05a1b1441e0..9be0d6d334e 100644
--- a/document/src/tests/serialization/annotationserializer_test.cpp
+++ b/document/src/tests/serialization/annotationserializer_test.cpp
@@ -35,7 +35,7 @@ class Test : public vespalib::TestApp {
void requireThatUnknownAnnotationIsSkipped();
public:
- int Main();
+ int Main() override;
};
int
diff --git a/document/src/tests/struct_anno/struct_anno_test.cpp b/document/src/tests/struct_anno/struct_anno_test.cpp
index a6c078698d3..9feb5b8a040 100644
--- a/document/src/tests/struct_anno/struct_anno_test.cpp
+++ b/document/src/tests/struct_anno/struct_anno_test.cpp
@@ -25,7 +25,7 @@ class Test : public vespalib::TestApp {
void requireThatStructFieldsCanContainAnnotations();
public:
- int Main();
+ int Main() override;
};
int Test::Main() {
diff --git a/document/src/tests/structfieldvaluetest.cpp b/document/src/tests/structfieldvaluetest.cpp
index b1c68662553..0daf8c97302 100644
--- a/document/src/tests/structfieldvaluetest.cpp
+++ b/document/src/tests/structfieldvaluetest.cpp
@@ -17,8 +17,8 @@ namespace document {
struct StructFieldValueTest : public CppUnit::TestFixture {
DocumentTypeRepo doc_repo;
StructFieldValueTest();
- void setUp() {}
- void tearDown() {}
+ void setUp() override {}
+ void tearDown() override {}
void testStruct();
void testEmptyStruct();
diff --git a/document/src/tests/testbytebuffer.h b/document/src/tests/testbytebuffer.h
index 58962d73449..baeccef979a 100644
--- a/document/src/tests/testbytebuffer.h
+++ b/document/src/tests/testbytebuffer.h
@@ -25,7 +25,7 @@ public:
/**
Initialization.
*/
- void setUp();
+ void setUp() override;
protected:
/**
diff --git a/document/src/tests/teststringutil.h b/document/src/tests/teststringutil.h
index be25c9667d3..355d90367ed 100644
--- a/document/src/tests/teststringutil.h
+++ b/document/src/tests/teststringutil.h
@@ -14,7 +14,7 @@ class StringUtil_Test : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE_END();
public:
- void setUp();
+ void setUp() override;
protected:
void test_escape();
diff --git a/document/src/tests/weightedsetfieldvaluetest.cpp b/document/src/tests/weightedsetfieldvaluetest.cpp
index bc1bdca6028..100db297b55 100644
--- a/document/src/tests/weightedsetfieldvaluetest.cpp
+++ b/document/src/tests/weightedsetfieldvaluetest.cpp
@@ -11,8 +11,8 @@ using vespalib::nbostream;
namespace document {
struct WeightedSetFieldValueTest : public CppUnit::TestFixture {
- void setUp() {}
- void tearDown() {}
+ void setUp() override {}
+ void tearDown() override {}
void testWeightedSet();
void testAddIgnoreZeroWeight();