move surf::As to s4u::As

[simgrid.git] / src / surf / network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 0fbed87..0a0dd90 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -44,20 +44,15 @@ public:
 
   ~NetworkNS3Model();
   Link* createLink(const char *name,
-                                     double bw_initial,
-                                     tmgr_trace_t bw_trace,
-                                     double lat_initial,
-                                     tmgr_trace_t lat_trace,
-                                     int initiallyOn,
-                                     tmgr_trace_t state_trace,
-                                     e_surf_link_sharing_policy_t policy,
-                                     xbt_dict_t properties);
-  xbt_dynar_t getRoute(NetCard *src, NetCard *dst);
+      double bw_initial, tmgr_trace_t bw_trace,
+      double lat_initial, tmgr_trace_t lat_trace,
+      tmgr_trace_t state_trace,
+      e_surf_link_sharing_policy_t policy,
+      xbt_dict_t properties) override;
   Action *communicate(NetCard *src, NetCard *dst, double size, double rate);
   double next_occuring_event(double now) override;
-  void updateActionsState(double now, double delta) override;
-  void addTraces() override {DIE_IMPOSSIBLE;}
   bool next_occuring_event_isIdempotent() {return false;}
+  void updateActionsState(double now, double delta) override;
 };
 
 /************
@@ -69,7 +64,7 @@ public:
                double bw_initial, double lat_initial);
   ~NetworkNS3Link();
 
-  void updateState(tmgr_trace_iterator_t event_type, double value) override;
+  void apply_event(tmgr_trace_iterator_t event, double value) override;
   void updateBandwidth(double value) override {THROW_UNIMPLEMENTED;}
   void updateLatency(double value) override {THROW_UNIMPLEMENTED;}