No virtual on override and override on destructor.

3 files changed, 66 insertions, 88 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h
index f904c1b4b53..bf0258deffc 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h
@@ -11,27 +11,13 @@
 #include <vespa/vespalib/stllike/hash_map.h>
 #include <vespa/searchcore/proton/common/hw_info.h>
 
-namespace search
-{
-
-namespace attribute { class Interlock; }
-
-namespace common
-{
-
-class FileHeaderContext;
+namespace search::attribute { class Interlock; }
 
-}
+namespace search::common { class FileHeaderContext; }
 
-}
+namespace searchcorespi { class IFlushTarget; }
 
-namespace searchcorespi
-{
-class IFlushTarget;
-}
-
-namespace proton
-{
+namespace proton {
 
 class AttributeDiskLayout;
 class FlushableAttribute;
@@ -120,16 +106,14 @@ public:
     AttributeManager(const vespalib::string &baseDir,
                      const vespalib::string &documentSubDbName,
                      const search::TuneFileAttributes &tuneFileAttributes,
-                     const search::common::FileHeaderContext &
-                     fileHeaderContext,
+                     const search::common::FileHeaderContext & fileHeaderContext,
                      search::ISequencedTaskExecutor &attributeFieldWriter,
                      const HwInfo &hwInfo);
 
     AttributeManager(const vespalib::string &baseDir,
                      const vespalib::string &documentSubDbName,
                      const search::TuneFileAttributes &tuneFileAttributes,
-                     const search::common::FileHeaderContext &
-                     fileHeaderContext,
+                     const search::common::FileHeaderContext & fileHeaderContext,
                      search::ISequencedTaskExecutor &attributeFieldWriter,
                      const IAttributeFactory::SP &factory,
                      const HwInfo &hwInfo);
@@ -137,7 +121,7 @@ public:
     AttributeManager(const AttributeManager &currMgr,
                      const Spec &newSpec,
                      IAttributeInitializerRegistry &initializerRegistry);
-    ~AttributeManager();
+    ~AttributeManager() override;
 
     AttributeVectorSP addAttribute(const AttributeSpec &spec, uint64_t serialNum);
 
@@ -155,52 +139,49 @@ public:
 
     static void padAttribute(search::AttributeVector &v, uint32_t docIdLimit);
 
-
     // Implements search::IAttributeManager
-    virtual search::AttributeGuard::UP getAttribute(const vespalib::string &name) const override;
-    virtual std::unique_ptr<search::attribute::AttributeReadGuard> getAttributeReadGuard(const string &name, bool stableEnumGuard) const override;
+    search::AttributeGuard::UP getAttribute(const vespalib::string &name) const override;
+    std::unique_ptr<search::attribute::AttributeReadGuard> getAttributeReadGuard(const string &name, bool stableEnumGuard) const override;
 
     /**
      * Fills all regular registered attributes (not extra attributes)
      * into the given list.
      */
-    virtual void getAttributeList(std::vector<search::AttributeGuard> &list) const override;
-
-    virtual search::attribute::IAttributeContext::UP createContext() const override;
+    void getAttributeList(std::vector<search::AttributeGuard> &list) const override;
 
+    search::attribute::IAttributeContext::UP createContext() const override;
 
     // Implements proton::IAttributeManager
 
-    virtual proton::IAttributeManager::SP create(const Spec &spec) const override;
+    proton::IAttributeManager::SP create(const Spec &spec) const override;
 
-    virtual std::vector<IFlushTargetSP> getFlushTargets() const override;
+    std::vector<IFlushTargetSP> getFlushTargets() const override;
 
-    virtual search::SerialNum getFlushedSerialNum(const vespalib::string &name) const override;
+    search::SerialNum getFlushedSerialNum(const vespalib::string &name) const override;
 
-    virtual SerialNum getOldestFlushedSerialNumber() const override;
+    SerialNum getOldestFlushedSerialNumber() const override;
 
-    virtual search::SerialNum getNewestFlushedSerialNumber() const override;
+    search::SerialNum getNewestFlushedSerialNumber() const override;
 
-    virtual void getAttributeListAll(std::vector<search::AttributeGuard> &list) const override;
+    void getAttributeListAll(std::vector<search::AttributeGuard> &list) const override;
 
-    virtual void pruneRemovedFields(search::SerialNum serialNum) override;
+    void pruneRemovedFields(search::SerialNum serialNum) override;
 
-    virtual const IAttributeFactory::SP &getFactory() const override { return _factory; }
+    const IAttributeFactory::SP &getFactory() const override { return _factory; }
 
-    virtual search::ISequencedTaskExecutor &getAttributeFieldWriter() const override;
+    search::ISequencedTaskExecutor &getAttributeFieldWriter() const override;
 
-    virtual search::AttributeVector *getWritableAttribute(const vespalib::string &name) const override;
+    search::AttributeVector *getWritableAttribute(const vespalib::string &name) const override;
 
-    virtual const std::vector<search::AttributeVector *> &getWritableAttributes() const override;
+    const std::vector<search::AttributeVector *> &getWritableAttributes() const override;
 
-    virtual void asyncForEachAttribute(std::shared_ptr<IAttributeFunctor> func) const override;
+    void asyncForEachAttribute(std::shared_ptr<IAttributeFunctor> func) const override;
 
-    virtual ExclusiveAttributeReadAccessor::UP getExclusiveReadAccessor(const vespalib::string &name) const override;
+    ExclusiveAttributeReadAccessor::UP getExclusiveReadAccessor(const vespalib::string &name) const override;
 
-    virtual void setImportedAttributes(std::unique_ptr<ImportedAttributesRepo> attributes) override;
+    void setImportedAttributes(std::unique_ptr<ImportedAttributesRepo> attributes) override;
 
-    virtual const ImportedAttributesRepo *getImportedAttributes() const override { return _importedAttributes.get(); }
+    const ImportedAttributesRepo *getImportedAttributes() const override { return _importedAttributes.get(); }
 };
 
 } // namespace proton
-
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h b/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h
index 82f8107f92f..f6a67a5ae3c 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h
@@ -29,32 +29,31 @@ private:
 public:
     FilterAttributeManager(const AttributeSet &acceptedAttributes,
                            const IAttributeManager::SP &mgr);
-    ~FilterAttributeManager();
+    ~FilterAttributeManager() override;
 
     // Implements search::IAttributeManager
-    virtual search::AttributeGuard::UP getAttribute(const vespalib::string &name) const override;
-    virtual void getAttributeList(std::vector<search::AttributeGuard> &list) const override;
-    virtual search::SerialNum getFlushedSerialNum(const vespalib::string &name) const override;
-    virtual search::attribute::IAttributeContext::UP createContext() const override;
-    virtual std::unique_ptr<search::attribute::AttributeReadGuard> getAttributeReadGuard(const vespalib::string &name, bool stableEnumGuard) const override;
+    search::AttributeGuard::UP getAttribute(const vespalib::string &name) const override;
+    void getAttributeList(std::vector<search::AttributeGuard> &list) const override;
+    search::SerialNum getFlushedSerialNum(const vespalib::string &name) const override;
+    search::attribute::IAttributeContext::UP createContext() const override;
+    std::unique_ptr<search::attribute::AttributeReadGuard> getAttributeReadGuard(const vespalib::string &name, bool stableEnumGuard) const override;
 
     // Implements proton::IAttributeManager
-    virtual IAttributeManager::SP create(const AttributeCollectionSpec &) const override;
-    virtual std::vector<searchcorespi::IFlushTarget::SP> getFlushTargets() const override;
-    virtual search::SerialNum getOldestFlushedSerialNumber() const override;
-    virtual search::SerialNum getNewestFlushedSerialNumber() const override;
-    virtual void getAttributeListAll(std::vector<search::AttributeGuard> &) const override;
-    virtual void pruneRemovedFields(search::SerialNum serialNum) override;
-    virtual const IAttributeFactory::SP &getFactory() const override;
-    virtual search::ISequencedTaskExecutor & getAttributeFieldWriter() const override;
-
-    virtual search::AttributeVector * getWritableAttribute(const vespalib::string &name) const override;
-    virtual const std::vector<search::AttributeVector *> & getWritableAttributes() const override;
-    virtual void asyncForEachAttribute(std::shared_ptr<IAttributeFunctor> func) const override;
-    virtual ExclusiveAttributeReadAccessor::UP getExclusiveReadAccessor(const vespalib::string &name) const override;
-    virtual void setImportedAttributes(std::unique_ptr<ImportedAttributesRepo> attributes) override;
-    virtual const ImportedAttributesRepo *getImportedAttributes() const override;
+    IAttributeManager::SP create(const AttributeCollectionSpec &) const override;
+    std::vector<searchcorespi::IFlushTarget::SP> getFlushTargets() const override;
+    search::SerialNum getOldestFlushedSerialNumber() const override;
+    search::SerialNum getNewestFlushedSerialNumber() const override;
+    void getAttributeListAll(std::vector<search::AttributeGuard> &) const override;
+    void pruneRemovedFields(search::SerialNum serialNum) override;
+    const IAttributeFactory::SP &getFactory() const override;
+    search::ISequencedTaskExecutor & getAttributeFieldWriter() const override;
+
+    search::AttributeVector * getWritableAttribute(const vespalib::string &name) const override;
+    const std::vector<search::AttributeVector *> & getWritableAttributes() const override;
+    void asyncForEachAttribute(std::shared_ptr<IAttributeFunctor> func) const override;
+    ExclusiveAttributeReadAccessor::UP getExclusiveReadAccessor(const vespalib::string &name) const override;
+    void setImportedAttributes(std::unique_ptr<ImportedAttributesRepo> attributes) override;
+    const ImportedAttributesRepo *getImportedAttributes() const override;
 };
 
 } // namespace proton
-
diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h b/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h
index b0b999e0d30..4ad3aa5fb42 100644
--- a/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h
+++ b/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h
@@ -23,58 +23,56 @@ public:
         _mock.addAttribute(name, attr);
     }
 
-    virtual search::AttributeGuard::UP getAttribute(const vespalib::string &name) const override {
+    search::AttributeGuard::UP getAttribute(const vespalib::string &name) const override {
         return _mock.getAttribute(name);
     }
-    virtual std::unique_ptr<search::attribute::AttributeReadGuard> getAttributeReadGuard(const vespalib::string &name, bool stableEnumGuard) const override {
+    std::unique_ptr<search::attribute::AttributeReadGuard> getAttributeReadGuard(const vespalib::string &name, bool stableEnumGuard) const override {
         return _mock.getAttributeReadGuard(name, stableEnumGuard);
     }
-    virtual void getAttributeList(std::vector<search::AttributeGuard> &list) const override {
+    void getAttributeList(std::vector<search::AttributeGuard> &list) const override {
         _mock.getAttributeList(list);
     }
-    virtual search::attribute::IAttributeContext::UP createContext() const override {
+    search::attribute::IAttributeContext::UP createContext() const override {
         return _mock.createContext();
     }
-    virtual IAttributeManager::SP create(const AttributeCollectionSpec &) const override {
+    IAttributeManager::SP create(const AttributeCollectionSpec &) const override {
         return IAttributeManager::SP();
     }
-    virtual std::vector<searchcorespi::IFlushTarget::SP> getFlushTargets() const override {
+    std::vector<searchcorespi::IFlushTarget::SP> getFlushTargets() const override {
         return std::vector<searchcorespi::IFlushTarget::SP>();
     }
-    virtual search::SerialNum getFlushedSerialNum(const vespalib::string &) const override {
+    search::SerialNum getFlushedSerialNum(const vespalib::string &) const override {
         return search::SerialNum();
     }
-    virtual search::SerialNum getOldestFlushedSerialNumber() const override {
+    search::SerialNum getOldestFlushedSerialNumber() const override {
         return search::SerialNum();
     }
-    virtual search::SerialNum getNewestFlushedSerialNumber() const override {
+    search::SerialNum getNewestFlushedSerialNumber() const override {
         return search::SerialNum();
     }
-    virtual void getAttributeListAll(std::vector<search::AttributeGuard> &) const override {
-    }
-    virtual void pruneRemovedFields(search::SerialNum) override {
-    }
-    virtual const IAttributeFactory::SP &getFactory() const override {
+    void getAttributeListAll(std::vector<search::AttributeGuard> &) const override { }
+    void pruneRemovedFields(search::SerialNum) override { }
+    const IAttributeFactory::SP &getFactory() const override {
         HDR_ABORT("should not be reached");
     }
-    virtual search::ISequencedTaskExecutor &getAttributeFieldWriter() const override {
+    search::ISequencedTaskExecutor &getAttributeFieldWriter() const override {
         HDR_ABORT("should not be reached");
     }
-    virtual search::AttributeVector *getWritableAttribute(const vespalib::string &) const override {
+    search::AttributeVector *getWritableAttribute(const vespalib::string &) const override {
         return nullptr;
     }
-    virtual const std::vector<search::AttributeVector *> &getWritableAttributes() const override {
+    const std::vector<search::AttributeVector *> &getWritableAttributes() const override {
         HDR_ABORT("should not be reached");
     }
-    virtual void asyncForEachAttribute(std::shared_ptr<IAttributeFunctor>) const override {
+    void asyncForEachAttribute(std::shared_ptr<IAttributeFunctor>) const override {
     }
-    virtual ExclusiveAttributeReadAccessor::UP getExclusiveReadAccessor(const vespalib::string &) const override {
+    ExclusiveAttributeReadAccessor::UP getExclusiveReadAccessor(const vespalib::string &) const override {
         return ExclusiveAttributeReadAccessor::UP();
     }
-    virtual void setImportedAttributes(std::unique_ptr<ImportedAttributesRepo> importedAttributes) override {
+    void setImportedAttributes(std::unique_ptr<ImportedAttributesRepo> importedAttributes) override {
         _importedAttributes = std::move(importedAttributes);
     }
-    virtual const ImportedAttributesRepo *getImportedAttributes() const override {
+    const ImportedAttributesRepo *getImportedAttributes() const override {
         return _importedAttributes.get();
     }
 };