Use override

3 files changed, 22 insertions, 26 deletions

diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h
index 8c3ff58b4db..36381e958a1 100644
--- a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h
+++ b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h
@@ -68,8 +68,8 @@ public:
         return *_metricManager;
     }
 
-    virtual void registerComponent(ManagedComponent&);
-    virtual void requestShutdown(vespalib::stringref reason);
+    void registerComponent(ManagedComponent&) override;
+    void requestShutdown(vespalib::stringref reason) override;
 
     void setMetricManager(metrics::MetricManager&);
     void setMemoryManager(MemoryManagerInterface&);
@@ -77,13 +77,13 @@ public:
     void setThreadPool(ThreadPool&);
     void setUpgradeFlag(UpgradeFlags flag);
 
-    const StatusReporter* getStatusReporter(vespalib::stringref id);
-    std::vector<const StatusReporter*> getStatusReporters();
+    const StatusReporter* getStatusReporter(vespalib::stringref id) override;
+    std::vector<const StatusReporter*> getStatusReporters() override;
 
-    void registerMetric(metrics::Metric&);
+    void registerMetric(metrics::Metric&) override;
     void registerUpdateHook(vespalib::stringref name,
                             MetricUpdateHook& hook,
-                            SecondTime period);
+                            SecondTime period) override;
     vespalib::MonitorGuard getMetricManagerLock() override;
     void registerShutdownListener(ShutdownListener&);
 
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h
index 0db8b7ab4b0..7eea530e229 100644
--- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h
+++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorymanager.h
@@ -57,19 +57,19 @@ public:
                     uint8_t priority,
                     ReduceMemoryUsageInterface* = 0);
 
-    virtual ~MemoryTokenImpl();
+    ~MemoryTokenImpl();
 
-    uint64_t getSize() const { return _currentlyAllocated; }
+    uint64_t getSize() const override { return _currentlyAllocated; }
     uint64_t getAllocationCount() const { return _allocCount; }
     const MemoryAllocationType& getType() const { return _type; }
     ReduceMemoryUsageInterface* getReducer() const { return _reducer; }
 
     uint8_t getPriority() const { return _priority; }
 
-    virtual bool resize(uint64_t min, uint64_t max);
+    bool resize(uint64_t min, uint64_t max) override;
 
-    virtual void print(std::ostream& out, bool verbose,
-                       const std::string& indent) const;
+    void print(std::ostream& out, bool verbose,
+               const std::string& indent) const override;
 };
 
 class AllocationLogic : public vespalib::Printable
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.h b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.h
index f5dfb4237d5..b31b4be3ce9 100644
--- a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.h
+++ b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.h
@@ -18,7 +18,7 @@ class ThreadImpl : public Thread
     struct BackendThread : public document::Runnable {
         ThreadImpl& _impl;
         BackendThread(ThreadImpl& impl) : _impl(impl) {}
-        virtual void run() { _impl.run(); }
+        void run() override { _impl.run(); }
     };
 
     /**
@@ -59,32 +59,28 @@ public:
 	       int ticksBeforeWait);
     ~ThreadImpl();
 
-    virtual bool interrupted() const;
-    virtual bool joined() const;
-    virtual void interrupt();
-    virtual void join();
-    virtual void registerTick(CycleType, MilliSecTime);
-    virtual uint64_t getWaitTime() const {
+    bool interrupted() const override;
+    bool joined() const override;
+    void interrupt() override;
+    void join() override;
+    void registerTick(CycleType, MilliSecTime) override;
+    uint64_t getWaitTime() const override {
         return _properties.getWaitTime();
     }
-    virtual int getTicksBeforeWait() const {
+    int getTicksBeforeWait() const override {
         return _properties.getTicksBeforeWait();
     }
-    virtual uint64_t getMaxProcessTime() const {
+    uint64_t getMaxProcessTime() const override {
         return _properties.getMaxProcessTime();
     }
 
-    virtual void updateParameters(uint64_t waitTime,
-                                  uint64_t maxProcessTime,
-                                  int ticksBeforeWait);
+    void updateParameters(uint64_t waitTime, uint64_t maxProcessTime, int ticksBeforeWait) override;
 
     void setTickData(const ThreadTickData&);
     ThreadTickData getTickData() const;
-    const ThreadProperties& getProperties() const
-        { return _properties; }
+    const ThreadProperties& getProperties() const { return _properties; }
 };
 
 } // defaultimplementation
 } // framework
 } // storage
-