diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-12 11:52:53 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-12 12:35:32 +0200 |
commit | fdfe587b34359cf8eb990eb9f87de20d708507ba (patch) | |
tree | bc7d549d3abd4bd132e804cada5308e670ac0a04 /storageserver | |
parent | ebd5a9094b3ba236538b4b86ab2f575e53b45473 (diff) |
add override in storageserver module
Diffstat (limited to 'storageserver')
7 files changed, 37 insertions, 37 deletions
diff --git a/storageserver/src/apps/storaged/storage.cpp b/storageserver/src/apps/storaged/storage.cpp index 255895c8c72..d21b64ecfd6 100644 --- a/storageserver/src/apps/storaged/storage.cpp +++ b/storageserver/src/apps/storaged/storage.cpp @@ -78,8 +78,8 @@ public: void handleSignals(); private: - bool Init(); - int Main(); + bool Init() override; + int Main() override; bool gotSignal() { return _lastSignal != 0; } }; diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp index ccd4d5a3720..be046ad6d31 100644 --- a/storageserver/src/tests/storageservertest.cpp +++ b/storageserver/src/tests/storageservertest.cpp @@ -88,8 +88,8 @@ struct StorageServerTest : public CppUnit::TestFixture { StorageServerTest(); ~StorageServerTest(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testNormalUsage(); void testPortOverlap_Stress(); @@ -166,8 +166,8 @@ namespace { Distributor(vdstestlib::DirConfig& config); ~Distributor(); - virtual StorageNode& getNode() { return _process.getNode(); } - virtual StorageNodeContext& getContext() + virtual StorageNode& getNode() override { return _process.getNode(); } + virtual StorageNodeContext& getContext() override { return _process.getContext(); } }; @@ -178,8 +178,8 @@ namespace { Storage(vdstestlib::DirConfig& config); ~Storage(); - virtual StorageNode& getNode() { return _process.getNode(); } - virtual StorageNodeContext& getContext() + virtual StorageNode& getNode() override { return _process.getNode(); } + virtual StorageNodeContext& getContext() override { return _process.getContext(); } spi::PartitionStateList getPartitions() { return _process.getProvider().getPartitionStates().getList(); } @@ -342,7 +342,7 @@ namespace { _startedShutdown = true; } - virtual void handleReply(mbus::Reply::UP reply) { + virtual void handleReply(mbus::Reply::UP reply) override { using documentapi::DocumentProtocol; --_currentPending; if (!reply->hasErrors()) { @@ -435,12 +435,12 @@ namespace { stop(); join(); } - virtual bool onStop() { + virtual bool onStop() override { vespalib::MonitorGuard monitor(_threadMonitor); monitor.signal(); return true; } - void run() { + void run() override { uint32_t seed = 0; uint32_t maxDocSize = 65536; init(); @@ -647,12 +647,12 @@ namespace { join(); } } - virtual bool onStop() { + virtual bool onStop() override { vespalib::MonitorGuard monitor(_threadMonitor); monitor.signal(); return true; } - void run() { + void run() override { uint32_t seed = 0; uint32_t maxDocSize = 65536; init(); @@ -828,7 +828,7 @@ namespace { return ost.str(); } - virtual void handleReply(mbus::Reply::UP reply) { + virtual void handleReply(mbus::Reply::UP reply) override { if (_startedShutdown) return; --_currentPending; std::ostringstream err; diff --git a/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.h b/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.h index ab119bfba5e..ad0fd3134eb 100644 --- a/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.h +++ b/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.h @@ -18,9 +18,9 @@ public: DummyServiceLayerProcess(const config::ConfigUri & configUri); ~DummyServiceLayerProcess() { shutdown(); } - virtual void shutdown(); - virtual void setupProvider(); - virtual spi::PersistenceProvider& getProvider() { return *_provider; } + virtual void shutdown() override; + virtual void setupProvider() override; + virtual spi::PersistenceProvider& getProvider() override { return *_provider; } }; } // storage diff --git a/storageserver/src/vespa/storageserver/app/memfileservicelayerprocess.h b/storageserver/src/vespa/storageserver/app/memfileservicelayerprocess.h index 2e365f3f1a2..6352f370525 100644 --- a/storageserver/src/vespa/storageserver/app/memfileservicelayerprocess.h +++ b/storageserver/src/vespa/storageserver/app/memfileservicelayerprocess.h @@ -40,19 +40,19 @@ public: MemFileServiceLayerProcess(const config::ConfigUri & configUri); ~MemFileServiceLayerProcess() { shutdown(); } - virtual void shutdown(); + virtual void shutdown() override; - void setupConfig(uint64_t subscribeTimeout); - virtual void removeConfigSubscriptions(); - virtual void setupProvider(); - virtual bool configUpdated(); - virtual void updateConfig(); + void setupConfig(uint64_t subscribeTimeout) override; + virtual void removeConfigSubscriptions() override; + virtual void setupProvider() override; + virtual bool configUpdated() override; + virtual void updateConfig() override; - virtual spi::PersistenceProvider& getProvider() { return *_provider; } + virtual spi::PersistenceProvider& getProvider() override { return *_provider; } - void configure(std::unique_ptr<vespa::config::storage::StorMemfilepersistenceConfig> config); - void configure(std::unique_ptr<vespa::config::storage::StorDevicesConfig> config); - void configure(std::unique_ptr<vespa::config::content::PersistenceConfig> config); + void configure(std::unique_ptr<vespa::config::storage::StorMemfilepersistenceConfig> config) override; + void configure(std::unique_ptr<vespa::config::storage::StorDevicesConfig> config) override; + void configure(std::unique_ptr<vespa::config::content::PersistenceConfig> config) override; }; } // storage diff --git a/storageserver/src/vespa/storageserver/app/process.h b/storageserver/src/vespa/storageserver/app/process.h index 85e30e73687..06e76425fdc 100644 --- a/storageserver/src/vespa/storageserver/app/process.h +++ b/storageserver/src/vespa/storageserver/app/process.h @@ -49,7 +49,7 @@ public: virtual StorageNode& getNode() = 0; virtual StorageNodeContext& getContext() = 0; - virtual int64_t getGeneration() const; + virtual int64_t getGeneration() const override; }; } // storage diff --git a/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.h b/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.h index 70f843ae597..018082d48b8 100644 --- a/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.h +++ b/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.h @@ -18,10 +18,10 @@ public: RpcServiceLayerProcess(const config::ConfigUri & configUri); ~RpcServiceLayerProcess() { shutdown(); } - virtual void shutdown(); - virtual void setupProvider(); - virtual void updateConfig(); - virtual spi::PersistenceProvider& getProvider() { return *_provider; } + virtual void shutdown() override; + virtual void setupProvider() override; + virtual void updateConfig() override; + virtual spi::PersistenceProvider& getProvider() override { return *_provider; } }; } // storage diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.h b/storageserver/src/vespa/storageserver/app/servicelayerprocess.h index d1ac919a674..dd22be8f7c7 100644 --- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.h +++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.h @@ -33,17 +33,17 @@ protected: public: ServiceLayerProcess(const config::ConfigUri & configUri); - virtual void shutdown(); + virtual void shutdown() override; virtual void setupProvider() = 0; virtual spi::PersistenceProvider& getProvider() = 0; - virtual void createNode(); + virtual void createNode() override; - virtual StorageNode& getNode() { return *_node; } - virtual StorageNodeContext& getContext() { return _context; } + virtual StorageNode& getNode() override { return *_node; } + virtual StorageNodeContext& getContext() override { return _context; } - virtual std::string getComponentName() const { return "servicelayer"; } + virtual std::string getComponentName() const override { return "servicelayer"; } }; } // storage |