From 0f59720c71f842e5ac1da02aa4db5832327b2b94 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 31 May 2016 09:57:31 +0200
Subject: [PATCH] Normalize virtual/override usage

---
 include/simgrid/s4u/comm.hpp   |  2 +-
 include/simgrid/simix.hpp      |  2 +-
 include/xbt/config.hpp         |  2 +-
 src/simix/ContextBoost.hpp     |  6 +++---
 src/surf/AsCluster.hpp         |  4 ++--
 src/surf/AsClusterFatTree.hpp  |  4 ++--
 src/surf/AsClusterTorus.hpp    |  2 +-
 src/surf/AsDijkstra.hpp        |  2 +-
 src/surf/AsFloyd.hpp           |  2 +-
 src/surf/AsFull.hpp            |  2 +-
 src/surf/AsImpl.hpp            |  2 +-
 src/surf/AsNone.hpp            |  2 +-
 src/surf/AsRoutedGraph.hpp     |  4 ++--
 src/surf/AsVivaldi.cpp         |  2 ++
 src/surf/AsVivaldi.hpp         |  2 +-
 src/surf/HostImpl.hpp          |  2 +-
 src/surf/cpu_cas01.cpp         |  2 ++
 src/surf/cpu_cas01.hpp         |  7 +++----
 src/surf/cpu_interface.cpp     |  7 +++++++
 src/surf/cpu_interface.hpp     |  7 ++++---
 src/surf/cpu_ti.hpp            |  4 ++--
 src/surf/host_clm03.cpp        |  2 ++
 src/surf/host_clm03.hpp        |  3 +--
 src/surf/network_cm02.cpp      | 22 ++++++++++++++++++++++
 src/surf/network_cm02.hpp      | 16 ++++++++--------
 src/surf/network_constant.cpp  |  5 +++++
 src/surf/network_constant.hpp  |  3 ++-
 src/surf/network_ib.hpp        |  2 +-
 src/surf/network_interface.cpp |  7 +++++++
 src/surf/network_interface.hpp |  8 ++------
 30 files changed, 90 insertions(+), 47 deletions(-)

diff --git a/include/simgrid/s4u/comm.hpp b/include/simgrid/s4u/comm.hpp
index 288e9c485e..471543520e 100644
--- a/include/simgrid/s4u/comm.hpp
+++ b/include/simgrid/s4u/comm.hpp
@@ -22,7 +22,7 @@ namespace s4u {
 XBT_PUBLIC_CLASS Comm : public Activity {
   Comm() : Activity() {}
 public:
-  virtual ~Comm();
+  ~Comm() override;
 
 public:
   /** Creates (but don't start) an async send to the mailbox #dest */
diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index c1b6a8212a..1122d16cfb 100644
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -136,7 +136,7 @@ public:
     : Context(std::move(code), cleanup_func, process)
   {}
 
-  ~AttachContext();
+  ~AttachContext() override;
 
   /** Called by the context when it is ready to give control
    *  to the maestro.
diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index c9d4df5204..6e7a118ccd 100644
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -30,7 +30,7 @@ public:
     : std::runtime_error(what) {}
   explicit missing_key_error(const char* what)
     : std::runtime_error(what) {}
-  ~missing_key_error() noexcept;
+  ~missing_key_error() noexcept override;
 };
 
 template<class T> inline
diff --git a/src/simix/ContextBoost.hpp b/src/simix/ContextBoost.hpp
index 2eaff3f1d3..7e9414d233 100644
--- a/src/simix/ContextBoost.hpp
+++ b/src/simix/ContextBoost.hpp
@@ -44,7 +44,7 @@ public:
   BoostContext(std::function<void()> code,
           void_pfn_smxprocess_t cleanup_func,
           smx_process_t process);
-  ~BoostContext();
+  ~BoostContext() override;
   virtual void resume();
 private:
   static void wrapper(int first, ...);
@@ -57,8 +57,8 @@ public:
   friend BoostParallelContext;
 
   BoostContextFactory();
-  virtual ~BoostContextFactory();
-  virtual Context* create_context(std::function<void()> code,
+  ~BoostContextFactory() override;
+  Context* create_context(std::function<void()> code,
     void_pfn_smxprocess_t, smx_process_t process) override;
   void run_all() override;
 };
diff --git a/src/surf/AsCluster.hpp b/src/surf/AsCluster.hpp
index aeaeb65b36..544906905c 100644
--- a/src/surf/AsCluster.hpp
+++ b/src/surf/AsCluster.hpp
@@ -14,9 +14,9 @@ namespace surf {
 class XBT_PRIVATE AsCluster: public AsImpl {
 public:
   explicit AsCluster(const char*name);
-  ~AsCluster();
+  ~AsCluster() override;
 
-  virtual void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
 
   virtual void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position);
diff --git a/src/surf/AsClusterFatTree.hpp b/src/surf/AsClusterFatTree.hpp
index f6aef466dc..f42da50d38 100644
--- a/src/surf/AsClusterFatTree.hpp
+++ b/src/surf/AsClusterFatTree.hpp
@@ -102,8 +102,8 @@ public:
 class XBT_PRIVATE AsClusterFatTree : public AsCluster {
 public:
   explicit AsClusterFatTree(const char*name);
-  ~AsClusterFatTree();
-  virtual void getRouteAndLatency(NetCard *src, NetCard *dst,
+  ~AsClusterFatTree() override;
+  void getRouteAndLatency(NetCard *src, NetCard *dst,
                                   sg_platf_route_cbarg_t into,
                                   double *latency) override;
 
diff --git a/src/surf/AsClusterTorus.hpp b/src/surf/AsClusterTorus.hpp
index 59d059388c..f91735e530 100644
--- a/src/surf/AsClusterTorus.hpp
+++ b/src/surf/AsClusterTorus.hpp
@@ -14,7 +14,7 @@ namespace simgrid {
     class XBT_PRIVATE AsClusterTorus:public simgrid::surf::AsCluster {
     public:
       explicit AsClusterTorus(const char*name);
-      virtual ~AsClusterTorus();
+      ~AsClusterTorus() override;
       void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position) override;
       void getRouteAndLatency(NetCard * src, NetCard * dst, sg_platf_route_cbarg_t into, double *latency) override;
       void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) override;
diff --git a/src/surf/AsDijkstra.hpp b/src/surf/AsDijkstra.hpp
index 081bffd9a1..302d650b17 100644
--- a/src/surf/AsDijkstra.hpp
+++ b/src/surf/AsDijkstra.hpp
@@ -35,7 +35,7 @@ public:
   AsDijkstra(const char*name, bool cached);
   void seal() override;
 
-  ~AsDijkstra();
+  ~AsDijkstra() override;
   xbt_node_t routeGraphNewNode(int id, int graph_id);
   graph_node_map_element_t nodeMapSearch(int id);
   void newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_route);
diff --git a/src/surf/AsFloyd.hpp b/src/surf/AsFloyd.hpp
index 1524311f7c..60e7a16103 100644
--- a/src/surf/AsFloyd.hpp
+++ b/src/surf/AsFloyd.hpp
@@ -15,7 +15,7 @@ namespace surf {
 class XBT_PRIVATE AsFloyd: public AsRoutedGraph {
 public:
   explicit AsFloyd(const char *name);
-  ~AsFloyd();
+  ~AsFloyd() override;
 
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   void addRoute(sg_platf_route_cbarg_t route) override;
diff --git a/src/surf/AsFull.hpp b/src/surf/AsFull.hpp
index a9fd274d19..fdf757f321 100644
--- a/src/surf/AsFull.hpp
+++ b/src/surf/AsFull.hpp
@@ -17,7 +17,7 @@ public:
 
   explicit AsFull(const char*name);
   void seal() override;
-  ~AsFull();
+  ~AsFull() override;
 
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   void addRoute(sg_platf_route_cbarg_t route) override;
diff --git a/src/surf/AsImpl.hpp b/src/surf/AsImpl.hpp
index f196fb7783..427f232c6e 100644
--- a/src/surf/AsImpl.hpp
+++ b/src/surf/AsImpl.hpp
@@ -28,7 +28,7 @@ XBT_PUBLIC_CLASS AsImpl : public s4u::As {
   friend simgrid::surf::RoutingPlatf;
 protected:
   explicit AsImpl(const char *name);
-  ~AsImpl();
+  ~AsImpl() override;
   
 public:
   /**
diff --git a/src/surf/AsNone.hpp b/src/surf/AsNone.hpp
index c1a2cab8cf..cc5167032c 100644
--- a/src/surf/AsNone.hpp
+++ b/src/surf/AsNone.hpp
@@ -15,7 +15,7 @@ namespace surf {
 class XBT_PRIVATE AsNone : public AsImpl {
 public:
   explicit AsNone(const char*name);
-  ~AsNone();
+  ~AsNone() override;
 
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
diff --git a/src/surf/AsRoutedGraph.hpp b/src/surf/AsRoutedGraph.hpp
index 144e9fb863..ac49bbe2ef 100644
--- a/src/surf/AsRoutedGraph.hpp
+++ b/src/surf/AsRoutedGraph.hpp
@@ -14,11 +14,11 @@ namespace surf {
 class XBT_PRIVATE AsRoutedGraph : public AsImpl {
 public:
   explicit AsRoutedGraph(const char*name);
-  ~AsRoutedGraph();
+  ~AsRoutedGraph() override;
 
   xbt_dynar_t getOneLinkRoutes() override;
 
-  virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
+  void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
   virtual sg_platf_route_cbarg_t newExtendedRoute(RoutingMode hierarchy, sg_platf_route_cbarg_t routearg, int change_order);
 protected:
   void getRouteCheckParams(NetCard *src, NetCard *dst);
diff --git a/src/surf/AsVivaldi.cpp b/src/surf/AsVivaldi.cpp
index 1a17446b0f..dce28ba020 100644
--- a/src/surf/AsVivaldi.cpp
+++ b/src/surf/AsVivaldi.cpp
@@ -47,6 +47,8 @@ namespace surf {
     : AsCluster(name)
   {}
 
+AsVivaldi::~AsVivaldi() {}
+
 void AsVivaldi::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
 {
   XBT_DEBUG("vivaldi_get_route_and_latency from '%s'[%d] '%s'[%d]", src->name(), src->id(), dst->name(), dst->id());
diff --git a/src/surf/AsVivaldi.hpp b/src/surf/AsVivaldi.hpp
index 94504eae05..4470eb88a2 100644
--- a/src/surf/AsVivaldi.hpp
+++ b/src/surf/AsVivaldi.hpp
@@ -15,7 +15,7 @@ namespace surf {
 class XBT_PRIVATE AsVivaldi: public AsCluster {
 public:
   explicit AsVivaldi(const char *name);
-  ~AsVivaldi() {};
+  ~AsVivaldi() override;
 
   xbt_dynar_t getOneLinkRoutes() override {return NULL;};
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 5ab2ae2767..f31677ad54 100644
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -100,7 +100,7 @@ public:
 
   /* Host destruction logic */
   /**************************/
-  ~HostImpl();
+  ~HostImpl() override;
 
 public:
   // Overload the method for covariant return type:
diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 24189a472e..1fcdca9e31 100644
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -237,5 +237,7 @@ CpuCas01Action::CpuCas01Action(Model *model, double cost, bool failed, double sp
   lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0);
 }
 
+CpuCas01Action::~CpuCas01Action() {}
+
 }
 }
diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index cee99343e9..cd6151c84d 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -25,7 +25,7 @@ class XBT_PRIVATE CpuCas01Action;
 class CpuCas01Model : public simgrid::surf::CpuModel {
 public:
   CpuCas01Model();
-  ~CpuCas01Model();
+  ~CpuCas01Model() override;
 
   Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) override;
   double next_occuring_event_full(double now) override;
@@ -39,7 +39,7 @@ public:
 class CpuCas01 : public Cpu {
 public:
   CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
-  ~CpuCas01();
+  ~CpuCas01() override;
   void apply_event(tmgr_trace_iterator_t event, double value) override;
   CpuAction *execution_start(double size) override;
   CpuAction *sleep(double duration) override;
@@ -61,8 +61,7 @@ class CpuCas01Action: public CpuAction {
 public:
   CpuCas01Action(Model *model, double cost, bool failed, double speed,
                  lmm_constraint_t constraint);
-
-  ~CpuCas01Action() {};
+  ~CpuCas01Action() override;
 };
 
 }
diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index ee3fc09929..0530b0ddee 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -30,6 +30,8 @@ simgrid::xbt::signal<void(CpuAction*, Action::State, Action::State)> cpuActionSt
  * Model *
  *********/
 
+CpuModel::~CpuModel() {}
+
 void CpuModel::updateActionsStateLazy(double now, double /*delta*/)
 {
   CpuAction *action;
@@ -115,6 +117,11 @@ void CpuModel::updateActionsStateFull(double now, double delta)
   }
 }
 
+bool CpuModel::next_occuring_event_isIdempotent()
+{
+  return true;
+}
+
 /************
  * Resource *
  ************/
diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index bd42a47027..7a0922ad0c 100644
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -40,6 +40,7 @@ class CpuPlugin;// FIXME:DEADCODE
 XBT_PUBLIC_CLASS CpuModel : public Model {
 public:
   CpuModel() : Model() {};
+  ~CpuModel() override;
 
   /**
    * @brief Create a Cpu
@@ -50,9 +51,9 @@ public:
    */
   virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core)=0;
 
-  void updateActionsStateLazy(double now, double delta);
-  void updateActionsStateFull(double now, double delta);
-  bool next_occuring_event_isIdempotent() {return true;}
+  void updateActionsStateLazy(double now, double delta) override;
+  void updateActionsStateFull(double now, double delta) override;
+  bool next_occuring_event_isIdempotent() override;
 };
 
 /************
diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index c635170b74..7f5e474481 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -111,7 +111,7 @@ typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
 class CpuTi : public Cpu {
 public:
   CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
-  ~CpuTi();
+  ~CpuTi() override;
 
   void setSpeedTrace(tmgr_trace_t trace) override;
 
@@ -146,7 +146,7 @@ typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
 class CpuTiModel : public CpuModel {
 public:
   CpuTiModel();
-  ~CpuTiModel();
+  ~CpuTiModel() override;
   Cpu *createCpu(simgrid::s4u::Host *host,  xbt_dynar_t speedPerPstate, int core) override;
   double next_occuring_event(double now) override;
   void updateActionsState(double now, double delta) override;
diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 42e6792cb6..4c9c6b8b32 100644
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -46,6 +46,8 @@ void surf_host_model_init_compound()
 namespace simgrid {
 namespace surf {
 
+HostCLM03Model::~HostCLM03Model() {}
+
 double HostCLM03Model::next_occuring_event(double now){
   adjustWeightOfDummyCpuActions();
 
diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp
index ac9b57dfe4..bc7ad09d4b 100644
--- a/src/surf/host_clm03.hpp
+++ b/src/surf/host_clm03.hpp
@@ -30,9 +30,8 @@ class XBT_PRIVATE HostCLM03Model;
 class HostCLM03Model : public HostModel {
 public:
   HostCLM03Model(): HostModel(){}
-  ~HostCLM03Model() {}
+  ~HostCLM03Model() override;
   double next_occuring_event(double now) override;
-
   void updateActionsState(double now, double delta) override;
 };
 }
diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 4c1cf0846a..bb735decf8 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -166,6 +166,8 @@ NetworkCm02Model::NetworkCm02Model()
   }
 }
 
+NetworkCm02Model::~NetworkCm02Model() {}
+
 Link* NetworkCm02Model::createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy,
     xbt_dict_t properties)
 {
@@ -387,6 +389,16 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d
   return action;
 }
 
+bool NetworkCm02Model::next_occuring_event_isIdempotent()
+{
+  return true;
+}
+
+void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* action)
+{
+  // Nothing
+};
+
 /************
  * Resource *
  ************/
@@ -502,9 +514,14 @@ void NetworkCm02Link::updateLatency(double value){
   }
 }
 
+NetworkCm02Link::~NetworkCm02Link() {}
+
 /**********
  * Action *
  **********/
+
+NetworkCm02Action::~NetworkCm02Action() {}
+
 void NetworkCm02Action::updateRemainingLazy(double now)
 {
   double delta = 0.0;
@@ -541,5 +558,10 @@ void NetworkCm02Action::updateRemainingLazy(double now)
   lastValue_ = lmm_variable_getvalue(getVariable());
 }
 
+void NetworkCm02Link::gapAppend(double size, const Link* link, NetworkAction* action)
+{
+  // Nothing
+};
+
 }
 }
diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index cf97be463f..0392c29319 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -39,14 +39,14 @@ namespace simgrid {
     class NetworkCm02Model : public NetworkModel {
     public:
       NetworkCm02Model();
-      ~NetworkCm02Model() { }
+      ~NetworkCm02Model();
       Link* createLink(const char *name, double bandwidth,  double latency, e_surf_link_sharing_policy_t policy,
           xbt_dict_t properties) override;
       void updateActionsStateLazy(double now, double delta) override;
       void updateActionsStateFull(double now, double delta) override;
       Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
-      bool next_occuring_event_isIdempotent() override {return true;}
-      virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
+      bool next_occuring_event_isIdempotent() override;
+      virtual void gapAppend(double size, const Link* link, NetworkAction* action);
     protected:
       bool haveGap_ = false;
     };
@@ -60,11 +60,11 @@ namespace simgrid {
       NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
           double bandwidth, double latency, e_surf_link_sharing_policy_t policy,
           lmm_system_t system);
-
+      ~NetworkCm02Link() override;
       void apply_event(tmgr_trace_iterator_t event, double value) override;
       void updateBandwidth(double value) override;
       void updateLatency(double value) override;
-      virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
+      virtual void gapAppend(double size, const Link* link, NetworkAction* action);
     };
 
 
@@ -74,11 +74,11 @@ namespace simgrid {
     class NetworkCm02Action : public NetworkAction {
       friend Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate);
       friend NetworkSmpiModel;
-
     public:
       NetworkCm02Action(Model *model, double cost, bool failed)
-    : NetworkAction(model, cost, failed) {};
-      void updateRemainingLazy(double now);
+      : NetworkAction(model, cost, failed) {};
+      ~NetworkCm02Action() override;
+      void updateRemainingLazy(double now) override;
     protected:
       double senderGap_;
     };
diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 1872ae1912..bbe31a5237 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -23,6 +23,8 @@ void surf_network_model_init_Constant()
 namespace simgrid {
   namespace surf {
 
+    NetworkConstantModel::~NetworkConstantModel() {}
+
     Link* NetworkConstantModel::createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy,
         xbt_dict_t properties) {
 
@@ -98,5 +100,8 @@ namespace simgrid {
         stateSet_->push_back(*this);
       }
     };
+
+    NetworkConstantAction::~NetworkConstantAction() {}
+
   }
 }
diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 6f88d3aea2..d4f393965b 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -27,7 +27,7 @@ namespace simgrid {
     class NetworkConstantModel : public NetworkModel {
     public:
       NetworkConstantModel()  : NetworkModel() { };
-      ~NetworkConstantModel() { }
+      ~NetworkConstantModel() override;
 
       Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
       double next_occuring_event(double now) override;
@@ -43,6 +43,7 @@ namespace simgrid {
     class NetworkConstantAction : public NetworkAction {
     public:
       NetworkConstantAction(NetworkConstantModel *model_, double size, double latency);
+      ~NetworkConstantAction();
       double initialLatency_;
     };
 
diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp
index a457a61f3c..b98bbcfb96 100644
--- a/src/surf/network_ib.hpp
+++ b/src/surf/network_ib.hpp
@@ -46,7 +46,7 @@ namespace simgrid {
     public:
       NetworkIBModel();
       explicit NetworkIBModel(const char *name);
-      ~NetworkIBModel();
+      ~NetworkIBModel() override;
       void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove);
 
       xbt_dict_t active_nodes;
diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index d18f218fe2..512a452391 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -110,6 +110,13 @@ simgrid::surf::NetworkModel *surf_network_model = NULL;
 namespace simgrid {
   namespace surf {
 
+    NetworkModel::~NetworkModel()
+    {
+      lmm_system_free(maxminSystem_);
+      xbt_heap_free(actionHeap_);
+      delete modifiedSet_;
+    }
+
     double NetworkModel::latencyFactor(double /*size*/) {
       return sg_latency_factor;
     }
diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 8c4eae43d5..421f3993a0 100644
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -51,11 +51,7 @@ namespace simgrid {
       NetworkModel() : Model() { }
 
       /** @brief Destructor */
-      ~NetworkModel() {
-        lmm_system_free(maxminSystem_);
-        xbt_heap_free(actionHeap_);
-        delete modifiedSet_;
-      }
+      ~NetworkModel() override;
 
       /**
        * @brief Create a Link
@@ -146,7 +142,7 @@ namespace simgrid {
       /* Link destruction logic */
       /**************************/
         protected:
-      ~Link();
+      ~Link() override;
         public:
       void destroy(); // Must be called instead of the destructor
         private:
-- 
2.20.1