X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ff45351157003bd7f4515eb63d713a14f0b1ee0..60219c257731fa65cd006beec0579b8443036fff:/src/surf/network_ns3.hpp diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index 26de23a2f3..0660b01810 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -21,9 +21,9 @@ public: ~NetworkNS3Model(); Link* createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override; - Action *communicate(routing::NetCard *src, routing::NetCard *dst, double size, double rate); - double next_occuring_event(double now) override; - bool next_occuring_event_isIdempotent() {return false;} + Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate); + double nextOccuringEvent(double now) override; + bool nextOccuringEventIsIdempotent() {return false;} void updateActionsState(double now, double delta) override; }; @@ -47,7 +47,7 @@ public: **********/ class XBT_PRIVATE NetworkNS3Action : public NetworkAction { public: - NetworkNS3Action(Model *model, double cost, routing::NetCard *src, routing::NetCard *dst); + NetworkNS3Action(Model *model, double cost, kernel::routing::NetCard *src, kernel::routing::NetCard *dst); bool isSuspended(); int unref(); @@ -56,8 +56,8 @@ public: //private: double lastSent_ = 0; - routing::NetCard *src_; - routing::NetCard *dst_; + kernel::routing::NetCard *src_; + kernel::routing::NetCard *dst_; }; }