From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 7 Jan 2016 10:04:50 +0000 (+0100)
Subject: shallow cleanups in net_cste: overide markers and kill useless code
X-Git-Tag: v3_13~1323
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d0d9dcbe52b4b8a3cb6125c07c2acd7af1e2f382?hp=805fcc757d8ab78c60ccf39f0ae471ebfb592d4e

shallow cleanups in net_cste: overide markers and kill useless code
---

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 326f31b7d5..673c70caa5 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -120,10 +120,5 @@ void NetworkConstantAction::cancel()
   return;
 }
 
-void NetworkConstantAction::setCategory(const char * /*category*/)
-{
-  //ignore completely the categories in constant model, they are not traced
-}
-
 }
 }
diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 742ed64483..a80825afcf 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -29,22 +29,22 @@ public:
   NetworkConstantModel()  : NetworkModel() { };
   ~NetworkConstantModel() { }
 
-  Action *communicate(NetCard *src, NetCard *dst, double size, double rate);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  bool shareResourcesIsIdempotent() {return true;}
+  Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
+  double shareResources(double now) override;
+  void updateActionsState(double now, double delta) override;
+  bool shareResourcesIsIdempotent() override {return true;}
 
-  Link* createLink(const char *name,
-		           double bw_initial,
-				   tmgr_trace_t bw_trace,
-				   double lat_initial,
-				   tmgr_trace_t lat_trace,
-				   e_surf_resource_state_t state_initial,
-				   tmgr_trace_t state_trace,
-				   e_surf_link_sharing_policy_t policy,
-				   xbt_dict_t properties)                  { DIE_IMPOSSIBLE; }
-  void addTraces()                                         { DIE_IMPOSSIBLE; }
-  xbt_dynar_t getRoute(NetCard *src, NetCard *dst) { DIE_IMPOSSIBLE; }
+  Link*
+  createLink(const char *name,
+      double bw_initial,
+      tmgr_trace_t bw_trace,
+      double lat_initial,
+      tmgr_trace_t lat_trace,
+      e_surf_resource_state_t state_initial,
+      tmgr_trace_t state_trace,
+      e_surf_link_sharing_policy_t policy,
+      xbt_dict_t properties)          override { DIE_IMPOSSIBLE; }
+  void addTraces()                    override { DIE_IMPOSSIBLE; }
 };
 
 /**********
@@ -63,9 +63,8 @@ public:
 	}
 	p_variable = NULL;
   };
-  int unref();
-  void cancel();
-  void setCategory(const char *category);
+  int unref() override;
+  void cancel() override;
   double m_latInit;
 };