X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3cd6f2bf8f8015a99c9bb351f568f32fe8429a0f..7c480b01951b33f03d72ede0a47a45a88bd40b61:/src/surf/network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index b30a7eb830..542558e4e7 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2017. The SimGrid Team.  All rights reserved.         */
+/* Copyright (c) 2004-2018. The SimGrid Team.  All rights reserved.         */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,7 +9,6 @@
 #include "xbt/base.h"
 
 #include "network_interface.hpp"
-#include "src/surf/ns3/ns3_interface.h"
 
 namespace simgrid {
 namespace surf {
@@ -20,10 +19,10 @@ public:
   ~NetworkNS3Model();
   LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
                        e_surf_link_sharing_policy_t policy) override;
-  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
-  double nextOccuringEvent(double now) override;
+  kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
+  double next_occuring_event(double now) override;
   bool nextOccuringEventIsIdempotent() override { return false; }
-  void updateActionsState(double now, double delta) override;
+  void update_actions_state(double now, double delta) override;
 };
 
 /************
@@ -46,13 +45,12 @@ public:
  **********/
 class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst);
+  NetworkNS3Action(kernel::resource::Model* model, double cost, s4u::Host* src, s4u::Host* dst);
 
-  bool isSuspended() override;
-  int unref() override;
   void suspend() override;
   void resume() override;
   std::list<LinkImpl*> links() override;
+  void update_remains_lazy(double now) override;
 
   // private:
   double lastSent_ = 0;