Merge pull request #6984 from vespa-engine/balder/increase-interval-from-1s-to-5s

GC unused code and add override and = default.

3 files changed, 4 insertions, 6 deletions

diff --git a/document/src/vespa/document/datatype/datatype.h b/document/src/vespa/document/datatype/datatype.h
index 0e444ce8d3b..4dd5d6aae64 100644
--- a/document/src/vespa/document/datatype/datatype.h
+++ b/document/src/vespa/document/datatype/datatype.h
@@ -46,7 +46,7 @@ protected:
     explicit DataType(vespalib::stringref name);
 
 public:
-    virtual ~DataType();
+    ~DataType() override;
     typedef std::unique_ptr<DataType> UP;
     typedef std::shared_ptr<DataType> SP;
     typedef vespalib::CloneablePtr<DataType> CP;
diff --git a/document/src/vespa/document/datatype/referencedatatype.cpp b/document/src/vespa/document/datatype/referencedatatype.cpp
index 7b7c83c7fa6..bc91f6b30ed 100644
--- a/document/src/vespa/document/datatype/referencedatatype.cpp
+++ b/document/src/vespa/document/datatype/referencedatatype.cpp
@@ -15,8 +15,7 @@ ReferenceDataType::ReferenceDataType(const DocumentType& targetDocType, int id)
 {
 }
 
-ReferenceDataType::~ReferenceDataType() {
-}
+ReferenceDataType::~ReferenceDataType() = default;
 
 std::unique_ptr<FieldValue> ReferenceDataType::createFieldValue() const {
     return std::make_unique<ReferenceFieldValue>(*this);
@@ -25,8 +24,7 @@ std::unique_ptr<FieldValue> ReferenceDataType::createFieldValue() const {
 void ReferenceDataType::print(std::ostream& os, bool verbose, const std::string& indent) const {
     (void) verbose;
     (void) indent;
-    os << "ReferenceDataType(" << _targetDocType.getName()
-       << ", id " << getId() << ')';
+    os << "ReferenceDataType(" << _targetDocType.getName() << ", id " << getId() << ')';
 }
 
 ReferenceDataType* ReferenceDataType::clone() const {
diff --git a/document/src/vespa/document/datatype/referencedatatype.h b/document/src/vespa/document/datatype/referencedatatype.h
index 5ca52f3ccb2..bc7db7800aa 100644
--- a/document/src/vespa/document/datatype/referencedatatype.h
+++ b/document/src/vespa/document/datatype/referencedatatype.h
@@ -14,7 +14,7 @@ class ReferenceDataType : public DataType {
     const DocumentType& _targetDocType;
 public:
     ReferenceDataType(const DocumentType& targetDocType, int id);
-    ~ReferenceDataType();
+    ~ReferenceDataType() override;
 
     const DocumentType& getTargetType() const noexcept {
         return _targetDocType;