Fields are declared in Model, delete them in ~Model.

diff --git a/src/surf/StorageImpl.cpp b/src/surf/StorageImpl.cpp
index d7bfde7..db277c6 100644 (file)
--- a/src/surf/StorageImpl.cpp
+++ b/src/surf/StorageImpl.cpp
@@ -46,7 +46,6 @@ StorageModel::StorageModel() : Model()
 
 StorageModel::~StorageModel()
 {
-  delete maxminSystem_;
   surf_storage_model = nullptr;
 }
 

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 163d045..1b9f80d 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -63,10 +63,6 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel()
 
 CpuCas01Model::~CpuCas01Model()
 {
-  delete maxminSystem_;
-  maxminSystem_ = nullptr;
-  delete modifiedSet_;
-
   surf_cpu_model_pm = nullptr;
 }
 

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index c52c443..1774956 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -67,11 +67,7 @@ simgrid::surf::NetworkModel *surf_network_model = nullptr;
 namespace simgrid {
   namespace surf {
 
-    NetworkModel::~NetworkModel()
-    {
-      delete maxminSystem_;
-      delete modifiedSet_;
-    }
+  NetworkModel::~NetworkModel() = default;
 
     double NetworkModel::latencyFactor(double /*size*/) {
       return sg_latency_factor;

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index a1ee65d..33644e2 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -43,8 +43,6 @@ HostL07Model::HostL07Model() : HostModel() {
 
 HostL07Model::~HostL07Model()
 {
-  delete maxminSystem_;
-  maxminSystem_ = nullptr;
   delete surf_network_model;
   delete surf_cpu_model_pm;
 }

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 9c92c1d..b2257a8 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -376,6 +376,8 @@ Model::~Model(){
   delete runningActionSet_;
   delete failedActionSet_;
   delete doneActionSet_;
+  delete modifiedSet_;
+  delete maxminSystem_;
 }
 
 Action* Model::actionHeapPop()