X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c4c51bdbf0da9491133f9d42f16b11da211b664b..a5c5765ba9e8336b55101d248a8f43fbf9cd0c0c:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 098563e4da..0392c29319 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -39,16 +39,16 @@ 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 m_haveGap = false;
+      bool haveGap_ = false;
     };
 
     /************
@@ -58,14 +58,13 @@ namespace simgrid {
     class NetworkCm02Link : public Link {
     public:
       NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
-          lmm_system_t system,
-          double constraint_value, double bw_peak, double lat_initial,
-          e_surf_link_sharing_policy_t policy);
-
+          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);
     };
 
 
@@ -75,13 +74,13 @@ 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 m_senderGap;
+      double senderGap_;
     };
 
   }