From 6aeac265ec1d8616244a6575824e7de4b0ba92d3 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Wed, 26 May 2021 23:49:15 +0200 Subject: [PATCH] Apply modernize-use-equals-default --- examples/1-1/sampler.cxx | 2 +- examples/1-n-1/sampler.cxx | 2 +- examples/copypush/sampler.cxx | 2 +- examples/dds/sampler.cxx | 3 +-- examples/multipart/sampler.cxx | 2 +- examples/multiple-channels/broadcaster.cxx | 2 +- examples/multiple-channels/sampler.cxx | 2 +- examples/multiple-transports/sampler1.cxx | 2 +- examples/multiple-transports/sampler2.cxx | 2 +- examples/n-m/sender.cxx | 2 +- examples/n-m/synchronizer.cxx | 2 +- examples/qc/sampler.cxx | 2 +- examples/readout/builder.cxx | 2 +- examples/readout/processor.cxx | 3 ++- examples/readout/readout.cxx | 2 +- examples/readout/receiver.cxx | 2 +- examples/readout/sender.cxx | 2 +- examples/region/sampler.cxx | 2 +- examples/region/sink.cxx | 2 +- examples/req-rep/client.cxx | 2 +- fairmq/FairMQChannel.h | 3 ++- fairmq/FairMQMessage.h | 2 +- fairmq/FairMQParts.h | 4 ++-- fairmq/FairMQPoller.h | 2 +- fairmq/FairMQSocket.h | 4 ++-- fairmq/FairMQTransportFactory.h | 2 +- fairmq/FairMQUnmanagedRegion.h | 8 ++++---- fairmq/ProgOptions.h | 2 +- fairmq/StateMachine.cxx | 2 +- fairmq/StateQueue.h | 4 ++-- fairmq/devices/BenchmarkSampler.h | 2 +- fairmq/devices/Multiplier.h | 2 +- fairmq/devices/Proxy.h | 2 +- fairmq/devices/Sink.h | 2 +- fairmq/devices/Splitter.h | 2 +- fairmq/sdk/commands/Commands.h | 2 +- fairmq/shmem/Common.h | 2 +- test/device/_config.cxx | 3 +-- test/device/_transitions.cxx | 2 +- test/plugin_services/_config.cxx | 4 ++-- 40 files changed, 49 insertions(+), 49 deletions(-) diff --git a/examples/1-1/sampler.cxx b/examples/1-1/sampler.cxx index 46a63508..0eb02ab4 100644 --- a/examples/1-1/sampler.cxx +++ b/examples/1-1/sampler.cxx @@ -16,7 +16,7 @@ namespace bpo = boost::program_options; class Sampler : public FairMQDevice { public: - Sampler() {} + Sampler() = default; protected: std::string fText; diff --git a/examples/1-n-1/sampler.cxx b/examples/1-n-1/sampler.cxx index 2b7404d9..302ce0b3 100644 --- a/examples/1-n-1/sampler.cxx +++ b/examples/1-n-1/sampler.cxx @@ -18,7 +18,7 @@ namespace bpo = boost::program_options; class Sampler : public FairMQDevice { public: - Sampler() {} + Sampler() = default; protected: std::string fText; diff --git a/examples/copypush/sampler.cxx b/examples/copypush/sampler.cxx index c01c13ee..b4694402 100644 --- a/examples/copypush/sampler.cxx +++ b/examples/copypush/sampler.cxx @@ -18,7 +18,7 @@ namespace bpo = boost::program_options; class Sampler : public FairMQDevice { public: - Sampler() {} + Sampler() = default; protected: void InitTask() override diff --git a/examples/dds/sampler.cxx b/examples/dds/sampler.cxx index 47747db6..ed5673c7 100644 --- a/examples/dds/sampler.cxx +++ b/examples/dds/sampler.cxx @@ -16,8 +16,7 @@ namespace bpo = boost::program_options; class Sampler : public FairMQDevice { public: - Sampler() - {} + Sampler() = default; void InitTask() override { diff --git a/examples/multipart/sampler.cxx b/examples/multipart/sampler.cxx index 97dac564..a8bf9bb5 100644 --- a/examples/multipart/sampler.cxx +++ b/examples/multipart/sampler.cxx @@ -20,7 +20,7 @@ namespace bpo = boost::program_options; class Sampler : public FairMQDevice { public: - Sampler() {} + Sampler() = default; protected: void InitTask() override diff --git a/examples/multiple-channels/broadcaster.cxx b/examples/multiple-channels/broadcaster.cxx index d9ec921e..6ee90753 100644 --- a/examples/multiple-channels/broadcaster.cxx +++ b/examples/multiple-channels/broadcaster.cxx @@ -17,7 +17,7 @@ namespace bpo = boost::program_options; class Broadcaster : public FairMQDevice { public: - Broadcaster() {} + Broadcaster() = default; protected: bool ConditionalRun() override diff --git a/examples/multiple-channels/sampler.cxx b/examples/multiple-channels/sampler.cxx index 1abfdd72..5279e9c9 100644 --- a/examples/multiple-channels/sampler.cxx +++ b/examples/multiple-channels/sampler.cxx @@ -19,7 +19,7 @@ namespace bpo = boost::program_options; class Sampler : public FairMQDevice { public: - Sampler() {} + Sampler() = default; void InitTask() override { diff --git a/examples/multiple-transports/sampler1.cxx b/examples/multiple-transports/sampler1.cxx index 1b5eb28e..329dfbd8 100644 --- a/examples/multiple-transports/sampler1.cxx +++ b/examples/multiple-transports/sampler1.cxx @@ -16,7 +16,7 @@ namespace bpo = boost::program_options; class Sampler1 : public FairMQDevice { public: - Sampler1() {} + Sampler1() = default; protected: void InitTask() override diff --git a/examples/multiple-transports/sampler2.cxx b/examples/multiple-transports/sampler2.cxx index 50d1f167..eda9e03b 100644 --- a/examples/multiple-transports/sampler2.cxx +++ b/examples/multiple-transports/sampler2.cxx @@ -16,7 +16,7 @@ namespace bpo = boost::program_options; class Sampler2 : public FairMQDevice { public: - Sampler2() {} + Sampler2() = default; protected: void InitTask() override diff --git a/examples/n-m/sender.cxx b/examples/n-m/sender.cxx index 862485bc..e8442fc8 100644 --- a/examples/n-m/sender.cxx +++ b/examples/n-m/sender.cxx @@ -20,7 +20,7 @@ namespace bpo = boost::program_options; class Sender : public FairMQDevice { public: - Sender() {} + Sender() = default; void InitTask() override { diff --git a/examples/n-m/synchronizer.cxx b/examples/n-m/synchronizer.cxx index 3bff1e5c..57cc05e0 100644 --- a/examples/n-m/synchronizer.cxx +++ b/examples/n-m/synchronizer.cxx @@ -18,7 +18,7 @@ namespace bpo = boost::program_options; class Synchronizer : public FairMQDevice { public: - Synchronizer() {} + Synchronizer() = default; bool ConditionalRun() override { diff --git a/examples/qc/sampler.cxx b/examples/qc/sampler.cxx index df05deca..306c0a26 100644 --- a/examples/qc/sampler.cxx +++ b/examples/qc/sampler.cxx @@ -15,7 +15,7 @@ class Sampler : public FairMQDevice { public: - Sampler() {} + Sampler() = default; protected: virtual bool ConditionalRun() diff --git a/examples/readout/builder.cxx b/examples/readout/builder.cxx index 9bc13cef..fe83dc01 100644 --- a/examples/readout/builder.cxx +++ b/examples/readout/builder.cxx @@ -16,7 +16,7 @@ namespace bpo = boost::program_options; class Builder : public FairMQDevice { public: - Builder() {} + Builder() = default; void Init() override { diff --git a/examples/readout/processor.cxx b/examples/readout/processor.cxx index 85ce00a7..95889ec6 100644 --- a/examples/readout/processor.cxx +++ b/examples/readout/processor.cxx @@ -14,7 +14,8 @@ namespace bpo = boost::program_options; class Processor : public FairMQDevice { public: - Processor() { + Processor() + { OnData("bp", &Processor::HandleData); } diff --git a/examples/readout/readout.cxx b/examples/readout/readout.cxx index a86935a7..24a400e0 100644 --- a/examples/readout/readout.cxx +++ b/examples/readout/readout.cxx @@ -18,7 +18,7 @@ namespace bpo = boost::program_options; class Readout : public FairMQDevice { public: - Readout() {} + Readout() = default; void InitTask() override { diff --git a/examples/readout/receiver.cxx b/examples/readout/receiver.cxx index 33d16aae..872e1fa8 100644 --- a/examples/readout/receiver.cxx +++ b/examples/readout/receiver.cxx @@ -14,7 +14,7 @@ namespace bpo = boost::program_options; class Receiver : public FairMQDevice { public: - Receiver() {} + Receiver() = default; void InitTask() override { diff --git a/examples/readout/sender.cxx b/examples/readout/sender.cxx index cb90e64a..0d9d0bcd 100644 --- a/examples/readout/sender.cxx +++ b/examples/readout/sender.cxx @@ -16,7 +16,7 @@ namespace bpo = boost::program_options; class Sender : public FairMQDevice { public: - Sender() {} + Sender() = default; void Init() override { diff --git a/examples/region/sampler.cxx b/examples/region/sampler.cxx index 53c2f565..458193bb 100644 --- a/examples/region/sampler.cxx +++ b/examples/region/sampler.cxx @@ -18,7 +18,7 @@ namespace bpo = boost::program_options; class Sampler : public FairMQDevice { public: - Sampler() {} + Sampler() = default; void InitTask() override { diff --git a/examples/region/sink.cxx b/examples/region/sink.cxx index b9dd7778..f60fefb5 100644 --- a/examples/region/sink.cxx +++ b/examples/region/sink.cxx @@ -14,7 +14,7 @@ namespace bpo = boost::program_options; class Sink : public FairMQDevice { public: - Sink() {} + Sink() = default; void InitTask() override { diff --git a/examples/req-rep/client.cxx b/examples/req-rep/client.cxx index 698cc7e0..59418596 100644 --- a/examples/req-rep/client.cxx +++ b/examples/req-rep/client.cxx @@ -18,7 +18,7 @@ namespace bpo = boost::program_options; class Client : public FairMQDevice { public: - Client() {} + Client() = default; void InitTask() override { diff --git a/fairmq/FairMQChannel.h b/fairmq/FairMQChannel.h index f4405b73..33e17a6a 100644 --- a/fairmq/FairMQChannel.h +++ b/fairmq/FairMQChannel.h @@ -81,7 +81,8 @@ class FairMQChannel // FairMQChannel& operator=(FairMQChannel&&) = delete; /// Destructor - virtual ~FairMQChannel() { /* LOG(warn) << "Destroying channel '" << fName << "'"; */ } + virtual ~FairMQChannel() = default; + // { LOG(warn) << "Destroying channel '" << fName << "'"; } struct ChannelConfigurationError : std::runtime_error { using std::runtime_error::runtime_error; }; diff --git a/fairmq/FairMQMessage.h b/fairmq/FairMQMessage.h index 5a2ccd74..8cdea93d 100644 --- a/fairmq/FairMQMessage.h +++ b/fairmq/FairMQMessage.h @@ -52,7 +52,7 @@ class FairMQMessage virtual void Copy(const FairMQMessage& msg) = 0; - virtual ~FairMQMessage() {}; + virtual ~FairMQMessage() = default; private: FairMQTransportFactory* fTransport{nullptr}; diff --git a/fairmq/FairMQParts.h b/fairmq/FairMQParts.h index c30c5953..4f5238d2 100644 --- a/fairmq/FairMQParts.h +++ b/fairmq/FairMQParts.h @@ -24,7 +24,7 @@ class FairMQParts public: /// Default constructor - FairMQParts() {}; + FairMQParts() = default; /// Copy Constructor FairMQParts(const FairMQParts&) = delete; /// Move constructor @@ -35,7 +35,7 @@ class FairMQParts template FairMQParts(Ts&&... messages) { AddPart(std::forward(messages)...); } /// Default destructor - ~FairMQParts() {}; + ~FairMQParts() = default; /// Adds part (FairMQMessage) to the container /// @param msg message pointer (for example created with NewMessage() method of FairMQDevice) diff --git a/fairmq/FairMQPoller.h b/fairmq/FairMQPoller.h index 4438e251..64be63f9 100644 --- a/fairmq/FairMQPoller.h +++ b/fairmq/FairMQPoller.h @@ -22,7 +22,7 @@ class FairMQPoller virtual bool CheckInput(const std::string& channelKey, const int index) = 0; virtual bool CheckOutput(const std::string& channelKey, const int index) = 0; - virtual ~FairMQPoller() {}; + virtual ~FairMQPoller() = default; }; using FairMQPollerPtr = std::unique_ptr; diff --git a/fairmq/FairMQSocket.h b/fairmq/FairMQSocket.h index 9994d52e..be07cbbb 100644 --- a/fairmq/FairMQSocket.h +++ b/fairmq/FairMQSocket.h @@ -35,7 +35,7 @@ enum class TransferCode : int class FairMQSocket { public: - FairMQSocket() {} + FairMQSocket() = default; FairMQSocket(FairMQTransportFactory* fac) : fTransport(fac) {} virtual std::string GetId() const = 0; @@ -76,7 +76,7 @@ class FairMQSocket FairMQTransportFactory* GetTransport() { return fTransport; } void SetTransport(FairMQTransportFactory* transport) { fTransport = transport; } - virtual ~FairMQSocket() {}; + virtual ~FairMQSocket() = default; private: FairMQTransportFactory* fTransport{nullptr}; diff --git a/fairmq/FairMQTransportFactory.h b/fairmq/FairMQTransportFactory.h index 86cacf68..f157aded 100644 --- a/fairmq/FairMQTransportFactory.h +++ b/fairmq/FairMQTransportFactory.h @@ -122,7 +122,7 @@ class FairMQTransportFactory virtual void Resume() = 0; virtual void Reset() = 0; - virtual ~FairMQTransportFactory() {}; + virtual ~FairMQTransportFactory() = default; static auto CreateTransportFactory(const std::string& type, const std::string& id = "", const fair::mq::ProgOptions* config = nullptr) -> std::shared_ptr; diff --git a/fairmq/FairMQUnmanagedRegion.h b/fairmq/FairMQUnmanagedRegion.h index a9bf721d..5940da17 100644 --- a/fairmq/FairMQUnmanagedRegion.h +++ b/fairmq/FairMQUnmanagedRegion.h @@ -27,7 +27,7 @@ enum class FairMQRegionEvent : int struct FairMQRegionInfo { - FairMQRegionInfo() {} + FairMQRegionInfo() = default; FairMQRegionInfo(bool _managed, uint64_t _id, void* _ptr, size_t _size, int64_t _flags, FairMQRegionEvent _event) : managed(_managed) @@ -63,7 +63,7 @@ using FairMQRegionEventCallback = std::function; class FairMQUnmanagedRegion { public: - FairMQUnmanagedRegion() {} + FairMQUnmanagedRegion() = default; FairMQUnmanagedRegion(FairMQTransportFactory* factory) : fTransport(factory) {} virtual void* GetData() const = 0; @@ -76,7 +76,7 @@ class FairMQUnmanagedRegion FairMQTransportFactory* GetTransport() { return fTransport; } void SetTransport(FairMQTransportFactory* transport) { fTransport = transport; } - virtual ~FairMQUnmanagedRegion() {}; + virtual ~FairMQUnmanagedRegion() = default; private: FairMQTransportFactory* fTransport{nullptr}; @@ -103,7 +103,7 @@ namespace fair::mq struct RegionConfig { - RegionConfig() {} + RegionConfig() = default; RegionConfig(bool l, bool z) : lock(l), zero(z) diff --git a/fairmq/ProgOptions.h b/fairmq/ProgOptions.h index 4d679763..14357006 100644 --- a/fairmq/ProgOptions.h +++ b/fairmq/ProgOptions.h @@ -35,7 +35,7 @@ class ProgOptions { public: ProgOptions(); - virtual ~ProgOptions() {} + virtual ~ProgOptions() = default; void ParseAll(const std::vector& cmdArgs, bool allowUnregistered); void ParseAll(const int argc, char const* const* argv, bool allowUnregistered = true); diff --git a/fairmq/StateMachine.cxx b/fairmq/StateMachine.cxx index c5b21893..5f494ead 100644 --- a/fairmq/StateMachine.cxx +++ b/fairmq/StateMachine.cxx @@ -84,7 +84,7 @@ struct Machine_ : public state_machine_def , fNewStatePending(false) {} - virtual ~Machine_() {} + virtual ~Machine_() = default; // initial states using initial_state = bmpl::vector; diff --git a/fairmq/StateQueue.h b/fairmq/StateQueue.h index 61db5a54..8bb4ab32 100644 --- a/fairmq/StateQueue.h +++ b/fairmq/StateQueue.h @@ -23,8 +23,8 @@ namespace fair::mq class StateQueue { public: - StateQueue() {} - ~StateQueue() {} + StateQueue() = default; + ~StateQueue() = default; fair::mq::State WaitForNext() { diff --git a/fairmq/devices/BenchmarkSampler.h b/fairmq/devices/BenchmarkSampler.h index 287ff624..aa911ffd 100644 --- a/fairmq/devices/BenchmarkSampler.h +++ b/fairmq/devices/BenchmarkSampler.h @@ -29,7 +29,7 @@ namespace fair::mq class BenchmarkSampler : public Device { public: - BenchmarkSampler() {} + BenchmarkSampler() = default; void InitTask() override { diff --git a/fairmq/devices/Multiplier.h b/fairmq/devices/Multiplier.h index 296ddf7f..fbd7c146 100644 --- a/fairmq/devices/Multiplier.h +++ b/fairmq/devices/Multiplier.h @@ -20,7 +20,7 @@ namespace fair::mq class Multiplier : public Device { public: - Multiplier() {} + Multiplier() = default; protected: bool fMultipart = true; diff --git a/fairmq/devices/Proxy.h b/fairmq/devices/Proxy.h index ffa13d19..e414d18a 100644 --- a/fairmq/devices/Proxy.h +++ b/fairmq/devices/Proxy.h @@ -19,7 +19,7 @@ namespace fair::mq class Proxy : public Device { public: - Proxy() {} + Proxy() = default; protected: bool fMultipart = true; diff --git a/fairmq/devices/Sink.h b/fairmq/devices/Sink.h index cbd85858..8d60d6cf 100644 --- a/fairmq/devices/Sink.h +++ b/fairmq/devices/Sink.h @@ -25,7 +25,7 @@ namespace fair::mq class Sink : public Device { public: - Sink() {} + Sink() = default; protected: bool fMultipart = false; diff --git a/fairmq/devices/Splitter.h b/fairmq/devices/Splitter.h index 119f3340..005e378f 100644 --- a/fairmq/devices/Splitter.h +++ b/fairmq/devices/Splitter.h @@ -19,7 +19,7 @@ namespace fair::mq class Splitter : public Device { public: - Splitter() {} + Splitter() = default; protected: bool fMultipart = true; diff --git a/fairmq/sdk/commands/Commands.h b/fairmq/sdk/commands/Commands.h index abf579a6..b398eab4 100644 --- a/fairmq/sdk/commands/Commands.h +++ b/fairmq/sdk/commands/Commands.h @@ -355,7 +355,7 @@ struct Cmds using container = std::vector>; struct CommandFormatError : std::runtime_error { using std::runtime_error::runtime_error; }; - explicit Cmds() {} + explicit Cmds() = default; template explicit Cmds(std::unique_ptr&& first, Rest&&... rest) diff --git a/fairmq/shmem/Common.h b/fairmq/shmem/Common.h index b05f64e9..0bd987dd 100644 --- a/fairmq/shmem/Common.h +++ b/fairmq/shmem/Common.h @@ -187,7 +187,7 @@ using Uint16MsgDebugMapHashMap = boost::unordered_map