summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-04-11 11:45:19 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-04-11 11:45:19 +0200
commit0213825f2130518f0a4fc06ad37974a23f6d0f9e (patch)
tree1b67fd140a7c86ddcd45da2eae99fb4a3bb41c47 /storage
parent5d765d002d0faaf410a5387c9e3aa537b6442286 (diff)
add override in storage/frameworkimpl module
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h6
-rw-r--r--storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h2
-rw-r--r--storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h2
-rw-r--r--storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp4
-rw-r--r--storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h6
-rw-r--r--storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp4
-rw-r--r--storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.h4
7 files changed, 13 insertions, 15 deletions
diff --git a/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h
index f58303519c5..2cf0255bf9f 100644
--- a/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h
+++ b/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h
@@ -36,16 +36,16 @@ public:
DistributorComponentRegisterImpl();
~DistributorComponentRegisterImpl();
- virtual void registerDistributorComponent(DistributorManagedComponent&);
+ virtual void registerDistributorComponent(DistributorManagedComponent&) override;
void setTimeCalculator(UniqueTimeCalculator& calc);
void setDistributorConfig(const DistributorConfig&);
void setVisitorConfig(const VisitorConfig&);
private:
- virtual void handleNewState();
+ virtual void handleNewState() override;
- virtual void setNodeStateUpdater(NodeStateUpdater& updater);
+ virtual void setNodeStateUpdater(NodeStateUpdater& updater) override;
};
} // storage
diff --git a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h
index fe73e5a1563..7d322f027d5 100644
--- a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h
+++ b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h
@@ -35,7 +35,7 @@ public:
return _minUsedBitsTracker;
}
- virtual void registerServiceLayerComponent(ServiceLayerManagedComponent&);
+ virtual void registerServiceLayerComponent(ServiceLayerManagedComponent&) override;
void setDiskCount(uint16_t count);
};
diff --git a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h
index 416391fbd53..cf9abbb6864 100644
--- a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h
+++ b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h
@@ -53,7 +53,7 @@ public:
NodeStateUpdater& getNodeStateUpdater()
{ assert(_nodeStateUpdater != 0); return *_nodeStateUpdater; }
- virtual void registerStorageComponent(StorageComponent&);
+ virtual void registerStorageComponent(StorageComponent&) override;
void setNodeInfo(vespalib::stringref clusterName,
const lib::NodeType& nodeType,
diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
index 10a3c0bcf75..12e2c31068a 100644
--- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
@@ -236,9 +236,7 @@ StatusWebServer::WebServer::onGetRequest(const string & tmpurl, const string &se
namespace {
class IndexPageReporter : public framework::HtmlStatusReporter {
std::ostringstream ost;
- virtual void reportHtmlStatus(std::ostream& out,
- const framework::HttpUrlPath&) const
- {
+ virtual void reportHtmlStatus(std::ostream& out, const framework::HttpUrlPath&) const override {
out << ost.str();
}
diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h
index 2f3f5ea9d57..c89c286387b 100644
--- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h
+++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h
@@ -32,7 +32,7 @@ class StatusWebServer : private config::IFetcherCallback<vespa::config::content:
virtual void onGetRequest(const string & url,
const string & serverSpec,
- Fast_HTTPConnection& conn);
+ Fast_HTTPConnection& conn) override;
const vespalib::string &getServerSpec() const {
return _serverSpec;
}
@@ -74,9 +74,9 @@ public:
const vespalib::string &serverSpec);
private:
- virtual void configure(std::unique_ptr<vespa::config::content::core::StorStatusConfig> config);
+ virtual void configure(std::unique_ptr<vespa::config::content::core::StorStatusConfig> config) override;
void getPage(const char* url, Fast_HTTPConnection& conn);
- virtual void run(framework::ThreadHandle&);
+ virtual void run(framework::ThreadHandle&) override;
};
diff --git a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp
index b904a0ea103..5d58a092053 100644
--- a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp
@@ -149,7 +149,7 @@ namespace {
virtual void visitThread(const vespalib::string& id,
const framework::ThreadProperties& tp,
const framework::ThreadTickData& tick,
- DeadLockDetector::State& state)
+ DeadLockDetector::State& state) override
{
// In case we just got a new tick, ignore the thread
if (tick._lastTickMs > _currentTime.getTime()) return;
@@ -285,7 +285,7 @@ namespace {
void visitThread(const vespalib::string& id,
const framework::ThreadProperties& tp,
const framework::ThreadTickData& tick,
- DeadLockDetector::State& /*state*/)
+ DeadLockDetector::State& /*state*/) override
{
_table._table.addRow(id);
uint32_t i = _table._table.getRowCount() - 1;
diff --git a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.h b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.h
index 61ce0b26757..146d0ccb751 100644
--- a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.h
+++ b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.h
@@ -88,11 +88,11 @@ private:
StorageComponent* _component;
framework::Thread::UP _thread;
- virtual void run(framework::ThreadHandle&);
+ virtual void run(framework::ThreadHandle&) override;
// Status implementation
virtual void reportHtmlStatus(std::ostream& out,
- const framework::HttpUrlPath&) const;
+ const framework::HttpUrlPath&) const override;
vespalib::string getBucketLockInfo() const;
};