X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/558cfc9fc06c8d1a7206b5995d3736cc11319529..3e2e56a1ff8c65d47e0cf4e458eac56e08a2b528:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index a15b173429..7a8644d0d2 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -27,10 +27,10 @@ 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;
+      Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate) override;
+      double nextOccuringEvent(double now) override;
       bool next_occuring_event_isIdempotent() override {return true;}
       void updateActionsState(double now, double delta) override;
 
@@ -42,20 +42,9 @@ namespace simgrid {
      **********/
     class NetworkConstantAction : public NetworkAction {
     public:
-      NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
-    : NetworkAction(model_, size, false)
-    , m_latInit(latency)
-    {
-        m_latency = latency;
-        if (m_latency <= 0.0) {
-          p_stateSet = getModel()->getDoneActionSet();
-          p_stateSet->push_back(*this);
-        }
-        p_variable = NULL;
-    };
-      int unref() override;
-      void cancel() override;
-      double m_latInit;
+      NetworkConstantAction(NetworkConstantModel *model_, double size, double latency);
+      ~NetworkConstantAction();
+      double initialLatency_;
     };
 
   }