From 9a51b791dab55275bffc183f8dfe9c26b6feaa57 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 8 Mar 2021 21:49:33 +0100 Subject: [PATCH] Remove useless declaration of default destructor. Remove public destructors defined '=default' at declaration, unless they are virtual and the enclosing class is derived somewhere. --- examples/cpp/app-chainsend/s4u-app-chainsend.cpp | 5 ----- examples/cpp/dht-kademlia/answer.hpp | 1 - include/simgrid/kernel/future.hpp | 1 - include/simgrid/kernel/routing/NetPoint.hpp | 1 - include/simgrid/kernel/routing/VivaldiZone.hpp | 1 - include/simgrid/kernel/routing/WifiZone.hpp | 1 - include/simgrid/s4u/Barrier.hpp | 1 - include/simgrid/s4u/Exec.hpp | 2 -- include/simgrid/s4u/Io.hpp | 2 -- src/instr/instr_paje_types.hpp | 1 - src/kernel/activity/ConditionVariableImpl.hpp | 1 - src/kernel/activity/SemaphoreImpl.hpp | 1 - src/mc/VisitedState.hpp | 1 - src/mc/checker/LivenessChecker.hpp | 3 --- src/mc/checker/SafetyChecker.hpp | 1 - src/mc/checker/UdporChecker.hpp | 1 - src/mc/sosp/Region.hpp | 1 - src/mc/sosp/Snapshot.hpp | 1 - src/mc/udpor_global.hpp | 2 -- src/msg/msg_private.hpp | 1 - src/plugins/dirty_page_tracking.cpp | 1 - src/plugins/host_load.cpp | 1 - src/plugins/link_energy.cpp | 1 - src/plugins/link_energy_wifi.cpp | 2 -- src/plugins/link_load.cpp | 1 - src/plugins/vm/VmHostExt.hpp | 1 - src/plugins/vm/VmLiveMigration.hpp | 1 - src/smpi/include/smpi_host.hpp | 1 - src/smpi/include/smpi_info.hpp | 1 - src/surf/cpu_cas01.hpp | 1 - src/surf/network_cm02.hpp | 3 --- src/surf/network_ib.hpp | 1 - src/surf/network_ns3.hpp | 1 - src/surf/network_smpi.hpp | 1 - src/surf/ptask_L07.hpp | 1 - src/xbt/config.cpp | 1 - 36 files changed, 48 deletions(-) diff --git a/examples/cpp/app-chainsend/s4u-app-chainsend.cpp b/examples/cpp/app-chainsend/s4u-app-chainsend.cpp index 040dcb0d74..2a38069714 100644 --- a/examples/cpp/app-chainsend/s4u-app-chainsend.cpp +++ b/examples/cpp/app-chainsend/s4u-app-chainsend.cpp @@ -21,13 +21,11 @@ public: : prev_(prev), next_(next), num_pieces(num_pieces) { } - ~ChainMessage() = default; }; class FilePiece { public: FilePiece() = default; - ~FilePiece() = default; }; class Peer { @@ -43,7 +41,6 @@ public: unsigned int total_pieces = 0; Peer() { me = simgrid::s4u::Mailbox::by_name(simgrid::s4u::Host::current()->get_cname()); } - ~Peer() = default; void joinChain() { @@ -130,8 +127,6 @@ public: mailboxes.push_back(simgrid::s4u::Mailbox::by_name(name)); } } - - ~Broadcaster() = default; }; static void peer() diff --git a/examples/cpp/dht-kademlia/answer.hpp b/examples/cpp/dht-kademlia/answer.hpp index 659528425a..72283129ae 100644 --- a/examples/cpp/dht-kademlia/answer.hpp +++ b/examples/cpp/dht-kademlia/answer.hpp @@ -19,7 +19,6 @@ class Answer { public: explicit Answer(unsigned int destination_id) : destination_id_(destination_id) {} - virtual ~Answer() = default; unsigned int getDestinationId() const { return destination_id_; } size_t getSize() const { return nodes_.size(); } const std::vector>& getNodes() const { return nodes_; } diff --git a/include/simgrid/kernel/future.hpp b/include/simgrid/kernel/future.hpp index ec2c7a4ad8..897e4c231a 100644 --- a/include/simgrid/kernel/future.hpp +++ b/include/simgrid/kernel/future.hpp @@ -279,7 +279,6 @@ class Future { public: Future() = default; explicit Future(std::shared_ptr> state) : state_(std::move(state)) {} - ~Future() = default; // Move type: Future(Future&) = delete; diff --git a/include/simgrid/kernel/routing/NetPoint.hpp b/include/simgrid/kernel/routing/NetPoint.hpp index fd1bcb27ad..e6cc4b3536 100644 --- a/include/simgrid/kernel/routing/NetPoint.hpp +++ b/include/simgrid/kernel/routing/NetPoint.hpp @@ -29,7 +29,6 @@ public: enum class Type { Host, Router, NetZone }; NetPoint(const std::string& name, NetPoint::Type component_type, NetZoneImpl* netzone_p); - ~NetPoint() = default; // Our rank in the vertices_ array of the netzone that contains us. unsigned int id() const { return id_; } diff --git a/include/simgrid/kernel/routing/VivaldiZone.hpp b/include/simgrid/kernel/routing/VivaldiZone.hpp index 2f05dfb266..943c27e271 100644 --- a/include/simgrid/kernel/routing/VivaldiZone.hpp +++ b/include/simgrid/kernel/routing/VivaldiZone.hpp @@ -57,7 +57,6 @@ class XBT_PRIVATE Coords { public: static xbt::Extension EXTENSION_ID; explicit Coords(NetPoint* host, const std::string& str); - virtual ~Coords() = default; std::vector coords; }; diff --git a/include/simgrid/kernel/routing/WifiZone.hpp b/include/simgrid/kernel/routing/WifiZone.hpp index 23728e800d..15cc9b01e1 100644 --- a/include/simgrid/kernel/routing/WifiZone.hpp +++ b/include/simgrid/kernel/routing/WifiZone.hpp @@ -23,7 +23,6 @@ public: explicit WifiZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel); WifiZone(const WifiZone&) = delete; WifiZone& operator=(const WifiZone) = delete; - ~WifiZone() override = default; void seal() override; void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override; diff --git a/include/simgrid/s4u/Barrier.hpp b/include/simgrid/s4u/Barrier.hpp index a1f577077d..f5d3fa57cf 100644 --- a/include/simgrid/s4u/Barrier.hpp +++ b/include/simgrid/s4u/Barrier.hpp @@ -32,7 +32,6 @@ public: /** Creates a barrier for the given amount of actors */ explicit Barrier(unsigned int expected_actors) : expected_actors_(expected_actors) {} #ifndef DOXYGEN - ~Barrier() = default; Barrier(Barrier const&) = delete; Barrier& operator=(Barrier const&) = delete; #endif diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp index 566d6017c8..0ae3e326e8 100644 --- a/include/simgrid/s4u/Exec.hpp +++ b/include/simgrid/s4u/Exec.hpp @@ -45,11 +45,9 @@ protected: explicit Exec(kernel::activity::ExecImplPtr pimpl); public: - ~Exec() override = default; #ifndef DOXYGEN Exec(Exec const&) = delete; Exec& operator=(Exec const&) = delete; - #endif static xbt::signal on_start; static xbt::signal on_completion; diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp index 832631d656..a4423ba8d1 100644 --- a/include/simgrid/s4u/Io.hpp +++ b/include/simgrid/s4u/Io.hpp @@ -33,8 +33,6 @@ private: public: #ifndef DOXYGEN friend Disk; // Factory of IOs - - ~Io() override = default; #endif static xbt::signal on_start; diff --git a/src/instr/instr_paje_types.hpp b/src/instr/instr_paje_types.hpp index 77632c10b0..e932eb907c 100644 --- a/src/instr/instr_paje_types.hpp +++ b/src/instr/instr_paje_types.hpp @@ -88,7 +88,6 @@ public: : Type(event_type, name, alias, "", father){}; ValueType(PajeEventType event_type, const std::string& name, Type* father) : Type(event_type, name, name, "", father){}; - ~ValueType() override = default; void add_entity_value(const std::string& name, const std::string& color); void add_entity_value(const std::string& name); EntityValue* get_entity_value(const std::string& name); diff --git a/src/kernel/activity/ConditionVariableImpl.hpp b/src/kernel/activity/ConditionVariableImpl.hpp index a6a7ea8abc..f80f4e70f6 100644 --- a/src/kernel/activity/ConditionVariableImpl.hpp +++ b/src/kernel/activity/ConditionVariableImpl.hpp @@ -25,7 +25,6 @@ class XBT_PUBLIC ConditionVariableImpl { public: ConditionVariableImpl() : piface_(this){}; - ~ConditionVariableImpl() = default; void remove_sleeping_actor(actor::ActorImpl& actor) { xbt::intrusive_erase(sleeping_, actor); } const s4u::ConditionVariable* get_iface() const { return &piface_; } diff --git a/src/kernel/activity/SemaphoreImpl.hpp b/src/kernel/activity/SemaphoreImpl.hpp index f2d05b7466..3be684e36c 100644 --- a/src/kernel/activity/SemaphoreImpl.hpp +++ b/src/kernel/activity/SemaphoreImpl.hpp @@ -23,7 +23,6 @@ class XBT_PUBLIC SemaphoreImpl { public: explicit SemaphoreImpl(unsigned int value) : value_(value){}; - ~SemaphoreImpl() = default; SemaphoreImpl(SemaphoreImpl const&) = delete; SemaphoreImpl& operator=(SemaphoreImpl const&) = delete; diff --git a/src/mc/VisitedState.hpp b/src/mc/VisitedState.hpp index 5d0c309526..9b78c6a425 100644 --- a/src/mc/VisitedState.hpp +++ b/src/mc/VisitedState.hpp @@ -24,7 +24,6 @@ public: int original_num = -1; // num field of the VisitedState to which I was declared equal to (used for dot_output) explicit VisitedState(unsigned long state_number); - ~VisitedState() = default; }; class XBT_PRIVATE VisitedStates { diff --git a/src/mc/checker/LivenessChecker.hpp b/src/mc/checker/LivenessChecker.hpp index cd73ea9549..39f899fdb0 100644 --- a/src/mc/checker/LivenessChecker.hpp +++ b/src/mc/checker/LivenessChecker.hpp @@ -30,7 +30,6 @@ public: bool exploration_started = false; explicit Pair(unsigned long expanded_pairs); - ~Pair() = default; Pair(Pair const&) = delete; Pair& operator=(Pair const&) = delete; @@ -48,13 +47,11 @@ public: VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, std::shared_ptr> atomic_propositions, std::shared_ptr graph_state); - ~VisitedPair() = default; }; class XBT_PRIVATE LivenessChecker : public Checker { public: explicit LivenessChecker(); - ~LivenessChecker() override = default; void run() override; RecordTrace get_record_trace() override; std::vector get_textual_trace() override; diff --git a/src/mc/checker/SafetyChecker.hpp b/src/mc/checker/SafetyChecker.hpp index 0d08f13846..a16070e0e2 100644 --- a/src/mc/checker/SafetyChecker.hpp +++ b/src/mc/checker/SafetyChecker.hpp @@ -24,7 +24,6 @@ class XBT_PRIVATE SafetyChecker : public Checker { public: explicit SafetyChecker(); - ~SafetyChecker() override = default; void run() override; RecordTrace get_record_trace() override; std::vector get_textual_trace() override; diff --git a/src/mc/checker/UdporChecker.hpp b/src/mc/checker/UdporChecker.hpp index d6541c1569..57dbe95c59 100644 --- a/src/mc/checker/UdporChecker.hpp +++ b/src/mc/checker/UdporChecker.hpp @@ -16,7 +16,6 @@ namespace mc { class XBT_PRIVATE UdporChecker : public Checker { public: explicit UdporChecker(); - ~UdporChecker() override = default; void run() override; RecordTrace get_record_trace() override; std::vector get_textual_trace() override; diff --git a/src/mc/sosp/Region.hpp b/src/mc/sosp/Region.hpp index 192a09379b..7c5fe19908 100644 --- a/src/mc/sosp/Region.hpp +++ b/src/mc/sosp/Region.hpp @@ -37,7 +37,6 @@ private: public: Region(RegionType type, void* start_addr, size_t size); - ~Region() = default; Region(Region const&) = delete; Region& operator=(Region const&) = delete; Region(Region&& that) = delete; diff --git a/src/mc/sosp/Snapshot.hpp b/src/mc/sosp/Snapshot.hpp index 35865cdcb6..fbcf185c4a 100644 --- a/src/mc/sosp/Snapshot.hpp +++ b/src/mc/sosp/Snapshot.hpp @@ -61,7 +61,6 @@ class XBT_PRIVATE Snapshot final : public AddressSpace { public: /* Initialization */ Snapshot(int num_state, RemoteSimulation* get_remote_simulation = &mc_model_checker->get_remote_simulation()); - ~Snapshot() override = default; /* Regular use */ bool on_heap(const void* address) const diff --git a/src/mc/udpor_global.hpp b/src/mc/udpor_global.hpp index e49fcf0d9c..2c8b7a123d 100644 --- a/src/mc/udpor_global.hpp +++ b/src/mc/udpor_global.hpp @@ -54,7 +54,6 @@ public: Configuration(const Configuration&) = default; Configuration& operator=(Configuration const&) = default; Configuration(Configuration&&) = default; - ~Configuration() = default; }; class UnfoldingEvent { @@ -65,7 +64,6 @@ public: UnfoldingEvent(const UnfoldingEvent&) = default; UnfoldingEvent& operator=(UnfoldingEvent const&) = default; UnfoldingEvent(UnfoldingEvent&&) = default; - ~UnfoldingEvent() = default; EventSet getHistory() const; diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index d87469cb3a..25da95860e 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -49,7 +49,6 @@ public: Task(const Task&) = delete; Task& operator=(const Task&) = delete; - ~Task() = default; bool is_used() const { return is_used_; } bool is_parallel() const { return parallel_; } diff --git a/src/plugins/dirty_page_tracking.cpp b/src/plugins/dirty_page_tracking.cpp index fb6ca075ca..a4b5fcbbe4 100644 --- a/src/plugins/dirty_page_tracking.cpp +++ b/src/plugins/dirty_page_tracking.cpp @@ -38,7 +38,6 @@ public: double get_max_downtime() const { return max_downtime_; } static simgrid::xbt::Extension EXTENSION_ID; - virtual ~DirtyPageTrackingExt() = default; DirtyPageTrackingExt() = default; }; diff --git a/src/plugins/host_load.cpp b/src/plugins/host_load.cpp index a9a58366a3..477e8e2bce 100644 --- a/src/plugins/host_load.cpp +++ b/src/plugins/host_load.cpp @@ -63,7 +63,6 @@ public: , current_flops_(host_->get_load()) { } - ~HostLoad() = default; HostLoad() = delete; explicit HostLoad(simgrid::s4u::Host& ptr) = delete; explicit HostLoad(simgrid::s4u::Host&& ptr) = delete; diff --git a/src/plugins/link_energy.cpp b/src/plugins/link_energy.cpp index efea1533f1..e0a600670a 100644 --- a/src/plugins/link_energy.cpp +++ b/src/plugins/link_energy.cpp @@ -50,7 +50,6 @@ public: static simgrid::xbt::Extension EXTENSION_ID; explicit LinkEnergy(simgrid::s4u::Link* ptr) : link_(ptr), last_updated_(surf_get_clock()) {} - ~LinkEnergy() = default; void init_watts_range_list(); double get_consumed_energy(); diff --git a/src/plugins/link_energy_wifi.cpp b/src/plugins/link_energy_wifi.cpp index 2dc82a0ce0..c2ff738043 100644 --- a/src/plugins/link_energy_wifi.cpp +++ b/src/plugins/link_energy_wifi.cpp @@ -35,8 +35,6 @@ public: static simgrid::xbt::Extension EXTENSION_ID; explicit LinkEnergyWifi(simgrid::s4u::Link* ptr) : link_(ptr) {} - - ~LinkEnergyWifi() = default; LinkEnergyWifi() = delete; /** diff --git a/src/plugins/link_load.cpp b/src/plugins/link_load.cpp index 2794b47659..edadcbcf2a 100644 --- a/src/plugins/link_load.cpp +++ b/src/plugins/link_load.cpp @@ -43,7 +43,6 @@ public: static simgrid::xbt::Extension EXTENSION_ID; explicit LinkLoad(simgrid::s4u::Link* ptr); - ~LinkLoad() = default; void track(); void untrack(); diff --git a/src/plugins/vm/VmHostExt.hpp b/src/plugins/vm/VmHostExt.hpp index 29c13b565e..ec89754ffb 100644 --- a/src/plugins/vm/VmHostExt.hpp +++ b/src/plugins/vm/VmHostExt.hpp @@ -14,7 +14,6 @@ namespace vm { class VmHostExt { public: static simgrid::xbt::Extension EXTENSION_ID; - virtual ~VmHostExt() = default; sg_size_t ramsize = 0; /* available ramsize (0= not taken into account) */ bool overcommit = true; /* Whether the host allows overcommiting more VM than the avail ramsize allows */ diff --git a/src/plugins/vm/VmLiveMigration.hpp b/src/plugins/vm/VmLiveMigration.hpp index 269c18509a..d0893c052f 100644 --- a/src/plugins/vm/VmLiveMigration.hpp +++ b/src/plugins/vm/VmLiveMigration.hpp @@ -19,7 +19,6 @@ public: s4u::ActorPtr tx_ = nullptr; s4u::ActorPtr rx_ = nullptr; static simgrid::xbt::Extension EXTENSION_ID; - virtual ~VmMigrationExt() = default; explicit VmMigrationExt(s4u::ActorPtr issuer, s4u::ActorPtr rx, s4u::ActorPtr tx) : issuer_(issuer), tx_(tx), rx_(rx) { } diff --git a/src/smpi/include/smpi_host.hpp b/src/smpi/include/smpi_host.hpp index 7d75aa2e44..f1ff837ef3 100644 --- a/src/smpi/include/smpi_host.hpp +++ b/src/smpi/include/smpi_host.hpp @@ -26,7 +26,6 @@ public: static xbt::Extension EXTENSION_ID; explicit Host(s4u::Host* ptr); - ~Host() = default; double orecv(size_t size); double osend(size_t size); diff --git a/src/smpi/include/smpi_info.hpp b/src/smpi/include/smpi_info.hpp index 91aeaee354..df50447cbe 100644 --- a/src/smpi/include/smpi_info.hpp +++ b/src/smpi/include/smpi_info.hpp @@ -22,7 +22,6 @@ class Info : public F2C{ public: explicit Info() {this->add_f();} explicit Info(const Info* orig) : map_(orig->map_) {this->add_f();} - ~Info() override = default; void ref(); static void unref(MPI_Info info); void set(const char* key, const char* value) { map_[key] = value; } diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp index d1c912c7af..7ef6cec921 100644 --- a/src/surf/cpu_cas01.hpp +++ b/src/surf/cpu_cas01.hpp @@ -42,7 +42,6 @@ public: class CpuCas01 : public Cpu { public: CpuCas01(s4u::Host* host, const std::vector& speed_per_pstate) : Cpu(host, speed_per_pstate) {} - ~CpuCas01() = default; CpuCas01(const CpuCas01&) = delete; CpuCas01& operator=(const CpuCas01&) = delete; void apply_event(profile::Event* event, double value) override; diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index 3460d3608f..79113759e6 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -31,7 +31,6 @@ class XBT_PRIVATE NetworkSmpiModel; class NetworkCm02Model : public NetworkModel { public: NetworkCm02Model(); - ~NetworkCm02Model() override = default; LinkImpl* create_link(const std::string& name, const std::vector& bandwidths, s4u::Link::SharingPolicy policy) override; void update_actions_state_lazy(double now, double delta) override; @@ -46,7 +45,6 @@ public: class NetworkCm02Link : public LinkImpl { public: NetworkCm02Link(const std::string& name, double bandwidth, s4u::Link::SharingPolicy policy, lmm::System* system); - ~NetworkCm02Link() override = default; void apply_event(kernel::profile::Event* event, double value) override; void set_bandwidth(double value) override; LinkImpl* set_latency(double value) override; @@ -60,7 +58,6 @@ class NetworkCm02Action : public NetworkAction { public: using NetworkAction::NetworkAction; - ~NetworkCm02Action() override = default; void update_remains_lazy(double now) override; }; } diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp index e08b23a0e6..007bc0c957 100644 --- a/src/surf/network_ib.hpp +++ b/src/surf/network_ib.hpp @@ -35,7 +35,6 @@ public: // number of comms the node is receiving int nbActiveCommsDown = 0; explicit IBNode(int id) : id(id){}; - virtual ~IBNode() = default; }; class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel { diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index 38f60c1a73..00b44bca75 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -17,7 +17,6 @@ namespace resource { class NetworkNS3Model : public NetworkModel { public: NetworkNS3Model(); - ~NetworkNS3Model() override = default; LinkImpl* create_link(const std::string& name, const std::vector& bandwidth, s4u::Link::SharingPolicy policy) override; Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp index e51a4400f2..b5fa65866b 100644 --- a/src/surf/network_smpi.hpp +++ b/src/surf/network_smpi.hpp @@ -18,7 +18,6 @@ namespace resource { class XBT_PRIVATE NetworkSmpiModel : public NetworkCm02Model { public: NetworkSmpiModel(); - ~NetworkSmpiModel() override = default; double get_latency_factor(double size) override; double get_bandwidth_factor(double size) override; diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp index 8d4aac4fb8..a38cb2d02c 100644 --- a/src/surf/ptask_L07.hpp +++ b/src/surf/ptask_L07.hpp @@ -78,7 +78,6 @@ public: class CpuL07 : public kernel::resource::Cpu { public: CpuL07(s4u::Host* host, const std::vector& speed_per_pstate) : Cpu(host, speed_per_pstate){}; - ~CpuL07() = default; CpuL07(const CpuL07&) = delete; CpuL07& operator=(const CpuL07&) = delete; diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp index 67a8fadb32..f213bb112c 100644 --- a/src/xbt/config.cpp +++ b/src/xbt/config.cpp @@ -182,7 +182,6 @@ public: TypedConfigurationElement(const std::string& key, const std::string& desc, T value, std::function callback) : ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback)) {} - ~TypedConfigurationElement() override = default; std::string get_string_value() override; const char* get_type_name() override; -- 2.20.1