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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index e231d3a497..08702719bb 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -10,7 +10,6 @@
 #include <xbt/base.h>
 
 #include "network_interface.hpp"
-#include "xbt/fifo.h"
 #include "xbt/graph.h"
 
 
@@ -40,13 +39,14 @@ namespace simgrid {
     public:
       NetworkCm02Model();
       explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self));
-      virtual ~NetworkCm02Model();
-      Link* createLink(const char* name, double bandwidth, double latency,
-                       e_surf_link_sharing_policy_t policy) override;
+      virtual ~NetworkCm02Model() = default;
+      LinkImpl* createLink(const char* name, double bandwidth, double latency,
+                           e_surf_link_sharing_policy_t policy) override;
       void updateActionsStateLazy(double now, double delta) override;
       void updateActionsStateFull(double now, double delta) override;
       Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
-      virtual void gapAppend(double size, const Link* link, NetworkAction* action);
+      virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action);
+
     protected:
       bool haveGap_ = false;
     };
@@ -55,15 +55,15 @@ namespace simgrid {
      * Resource *
      ************/
 
-    class NetworkCm02Link : public Link {
+    class NetworkCm02Link : public LinkImpl {
     public:
       NetworkCm02Link(NetworkCm02Model* model, const char* name, 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;
+      virtual ~NetworkCm02Link() = default;
+      void apply_event(tmgr_trace_event_t event, double value) override;
       void setBandwidth(double value) override;
       void setLatency(double value) override;
-      virtual void gapAppend(double size, const Link* link, NetworkAction* action);
+      virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action);
     };
 
 
@@ -76,7 +76,7 @@ namespace simgrid {
     public:
       NetworkCm02Action(Model *model, double cost, bool failed)
       : NetworkAction(model, cost, failed) {};
-      ~NetworkCm02Action() override;
+      virtual ~NetworkCm02Action() = default;
       void updateRemainingLazy(double now) override;
     protected:
       double senderGap_;