From 153dcfab94595876630e97a97b23a0d5fc7d3d90 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Tue, 14 Sep 2021 12:50:44 +0200 Subject: [PATCH] Apply modernize-use-override --- fairmq/ofi/TransportFactory.h | 2 +- fairmq/plugins/config/Config.h | 2 +- fairmq/plugins/control/Control.h | 2 +- fairmq/shmem/Manager.h | 6 ------ fairmq/shmem/Region.h | 6 ------ fairmq/zeromq/UnmanagedRegion.h | 6 +++--- test/device/_config.cxx | 2 +- test/device/_error_state.cxx | 2 +- test/device/_transitions.cxx | 2 +- 9 files changed, 9 insertions(+), 21 deletions(-) diff --git a/fairmq/ofi/TransportFactory.h b/fairmq/ofi/TransportFactory.h index 49afef141..3931d9aa9 100644 --- a/fairmq/ofi/TransportFactory.h +++ b/fairmq/ofi/TransportFactory.h @@ -59,7 +59,7 @@ struct TransportFactory final : mq::TransportFactory TransportFactory(TransportFactory&&) = delete; TransportFactory& operator=(const TransportFactory&) = delete; TransportFactory& operator=(TransportFactory&&) = delete; - ~TransportFactory() = default; + ~TransportFactory() override = default; auto CreateMessage() -> std::unique_ptr override { diff --git a/fairmq/plugins/config/Config.h b/fairmq/plugins/config/Config.h index 896eeb27d..1f6c42a65 100644 --- a/fairmq/plugins/config/Config.h +++ b/fairmq/plugins/config/Config.h @@ -26,7 +26,7 @@ class Config : public Plugin Config& operator=(const Config&) = delete; Config& operator=(Config&&) = delete; - ~Config(); + ~Config() override; }; Plugin::ProgOptions ConfigPluginProgramOptions(); diff --git a/fairmq/plugins/control/Control.h b/fairmq/plugins/control/Control.h index 7cce67989..b8fd40f3a 100644 --- a/fairmq/plugins/control/Control.h +++ b/fairmq/plugins/control/Control.h @@ -33,7 +33,7 @@ class Control : public Plugin Control& operator=(const Control&) = delete; Control& operator=(Control&&) = delete; - ~Control(); + ~Control() override; private: auto InteractiveMode() -> void; diff --git a/fairmq/shmem/Manager.h b/fairmq/shmem/Manager.h index ecf62aadc..deff90b71 100644 --- a/fairmq/shmem/Manager.h +++ b/fairmq/shmem/Manager.h @@ -5,12 +5,6 @@ * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ -/** - * Manager.h - * - * @since 2016-04-08 - * @author A. Rybalchenko - */ #ifndef FAIR_MQ_SHMEM_MANAGER_H_ #define FAIR_MQ_SHMEM_MANAGER_H_ diff --git a/fairmq/shmem/Region.h b/fairmq/shmem/Region.h index 52cd00180..65fca6ac4 100644 --- a/fairmq/shmem/Region.h +++ b/fairmq/shmem/Region.h @@ -5,12 +5,6 @@ * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ -/** -* Region.h -* -* @since 2016-04-08 -* @author A. Rybalchenko -*/ #ifndef FAIR_MQ_SHMEM_REGION_H_ #define FAIR_MQ_SHMEM_REGION_H_ diff --git a/fairmq/zeromq/UnmanagedRegion.h b/fairmq/zeromq/UnmanagedRegion.h index 49894ec5c..295de0cc6 100644 --- a/fairmq/zeromq/UnmanagedRegion.h +++ b/fairmq/zeromq/UnmanagedRegion.h @@ -63,8 +63,8 @@ class UnmanagedRegion final : public fair::mq::UnmanagedRegion UnmanagedRegion& operator=(const UnmanagedRegion&) = delete; UnmanagedRegion& operator=(UnmanagedRegion&&) = delete; - virtual void* GetData() const override { return fBuffer; } - virtual size_t GetSize() const override { return fSize; } + void* GetData() const override { return fBuffer; } + size_t GetSize() const override { return fSize; } uint16_t GetId() const override { return fId; } int64_t GetUserFlags() const { return fUserFlags; } void SetLinger(uint32_t /* linger */) override { LOG(debug) << "ZeroMQ UnmanagedRegion linger option not implemented. Acknowledgements are local."; } @@ -72,7 +72,7 @@ class UnmanagedRegion final : public fair::mq::UnmanagedRegion Transport GetType() const override { return Transport::ZMQ; } - virtual ~UnmanagedRegion() + ~UnmanagedRegion() override { LOG(debug) << "destroying region " << fId; fCtx.RemoveRegion(fId); diff --git a/test/device/_config.cxx b/test/device/_config.cxx index ceae68e2d..ca9ed87cf 100644 --- a/test/device/_config.cxx +++ b/test/device/_config.cxx @@ -72,7 +72,7 @@ class TestDevice : public FairMQDevice TestDevice& operator=(const TestDevice&) = delete; TestDevice& operator=(TestDevice&&) = delete; - ~TestDevice() + ~TestDevice() override { WaitForState(fair::mq::State::Running); ChangeState(fair::mq::Transition::Stop); diff --git a/test/device/_error_state.cxx b/test/device/_error_state.cxx index 335d2b9f9..e9758576e 100644 --- a/test/device/_error_state.cxx +++ b/test/device/_error_state.cxx @@ -49,7 +49,7 @@ class BadDevice : public FairMQDevice BadDevice& operator=(const BadDevice&) = delete; BadDevice& operator=(BadDevice&&) = delete; - ~BadDevice() + ~BadDevice() override { ChangeState(fair::mq::Transition::ResetDevice); diff --git a/test/device/_transitions.cxx b/test/device/_transitions.cxx index 979fb8100..7e84e86fa 100644 --- a/test/device/_transitions.cxx +++ b/test/device/_transitions.cxx @@ -26,7 +26,7 @@ class SlowDevice : public FairMQDevice SlowDevice() = default; protected: - void Init() + void Init() override { this_thread::sleep_for(chrono::milliseconds(100)); }