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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 57c31ab7d5..91945321cc 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -53,12 +53,11 @@ public:
                                      e_surf_link_sharing_policy_t policy,
                                      xbt_dict_t properties);
   xbt_dynar_t getRoute(NetCard *src, NetCard *dst);
-  Action *communicate(NetCard *src, NetCard *dst,
-                               double size, double rate);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  void addTraces(){DIE_IMPOSSIBLE;}
-  bool shareResourcesIsIdempotent() {return false;}
+  Action *communicate(NetCard *src, NetCard *dst, double size, double rate);
+  double next_occuring_event(double now) override;
+  bool next_occuring_event_isIdempotent() {return false;}
+  void updateActionsState(double now, double delta) override;
+  void addTraces() override {DIE_IMPOSSIBLE;}
 };
 
 /************
@@ -70,9 +69,9 @@ public:
                double bw_initial, double lat_initial);
   ~NetworkNS3Link();
 
-  void updateState(tmgr_trace_iterator_t event_type, double value, double date);
-  void updateBandwidth(double value, double date=surf_get_clock()){THROW_UNIMPLEMENTED;}
-  void updateLatency(double value, double date=surf_get_clock()){THROW_UNIMPLEMENTED;}
+  void apply_event(tmgr_trace_iterator_t event_type, double value) override;
+  void updateBandwidth(double value) override {THROW_UNIMPLEMENTED;}
+  void updateLatency(double value) override {THROW_UNIMPLEMENTED;}
 
 //private:
  int m_created;