Two small sonar fixes

- dead stores
- default destructor should not even be written

diff --git a/examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp b/examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp
index 25bc4ba..f5d185a 100644 (file)
--- a/examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp
+++ b/examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp
@@ -150,9 +150,6 @@ static void runner()
            host1->get_cname(), host1->get_speed(), (new_energy_host1 - old_energy_host1), sg_host_get_consumed_energy(host1),
            host2->get_cname(), host2->get_speed(), (new_energy_host2 - old_energy_host2), sg_host_get_consumed_energy(host2));
 
-  old_energy_host1 = new_energy_host1;
-  old_energy_host2 = new_energy_host2;
-
   XBT_INFO("Now is time to quit!");
 }
 

diff --git a/src/kernel/resource/DiskImpl.cpp b/src/kernel/resource/DiskImpl.cpp
index 3388bdf..f8132f3 100644 (file)
--- a/src/kernel/resource/DiskImpl.cpp
+++ b/src/kernel/resource/DiskImpl.cpp
@@ -24,10 +24,6 @@ DiskModel::DiskModel() : Model(Model::UpdateAlgo::FULL)
   set_maxmin_system(new simgrid::kernel::lmm::System(true /* selective update */));
 }
 
-DiskModel::~DiskModel()
-{
-}
-
 /************
  * Resource *
  ************/

diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp
index c7bdd53..8f7af7b 100644 (file)
--- a/src/kernel/resource/DiskImpl.hpp
+++ b/src/kernel/resource/DiskImpl.hpp
@@ -37,7 +37,7 @@ public:
   DiskModel();
   DiskModel(const DiskModel&) = delete;
   DiskModel& operator=(const DiskModel&) = delete;
-  ~DiskModel() override;
+  ~DiskModel() = default;
 
   virtual DiskImpl* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) = 0;
 };

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 4b535e1..973cadc 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -73,8 +73,6 @@ CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo)
   set_maxmin_system(new lmm::System(select));
 }
 
-CpuCas01Model::~CpuCas01Model() {}
-
 Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
 {
   return (new CpuCas01(host, speed_per_pstate))->set_model(this);
@@ -207,8 +205,6 @@ int CpuCas01Action::requested_core() const
   return requested_core_;
 }
 
-CpuCas01Action::~CpuCas01Action() = default;
-
 } // namespace resource
 } // namespace kernel
 } // namespace simgrid

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 7ef6cec..3d262a4 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -30,7 +30,7 @@ public:
   explicit CpuCas01Model(Model::UpdateAlgo algo);
   CpuCas01Model(const CpuCas01Model&) = delete;
   CpuCas01Model& operator=(const CpuCas01Model&) = delete;
-  ~CpuCas01Model() override;
+  ~CpuCas01Model() = default;
 
   Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
 };
@@ -67,7 +67,7 @@ public:
                  int requested_core = 1);
   CpuCas01Action(const CpuCas01Action&) = delete;
   CpuCas01Action& operator=(const CpuCas01Action&) = delete;
-  ~CpuCas01Action() override;
+  ~CpuCas01Action() = default;
   int requested_core() const;
 
 private:

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 5475676..c62b93b 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -280,8 +280,6 @@ CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL)
 {
 }
 
-CpuTiModel::~CpuTiModel() {}
-
 Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
 {
   return (new CpuTi(host, speed_per_pstate))->set_model(this);

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 81b5618..fab7a53 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -145,7 +145,7 @@ public:
   CpuTiModel();
   CpuTiModel(const CpuTiModel&) = delete;
   CpuTiModel& operator=(const CpuTiModel&) = delete;
-  ~CpuTiModel() override;
+  ~CpuTiModel() = default;
   Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
   double next_occurring_event(double now) override;
   void update_actions_state(double now, double delta) override;