X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd98f5dac2c0beab27ab6627b8c805bd4f5be526..0fa053f89a0b5f34a050f4790925d9d63ac11073:/src/surf/ns3/ns3_simulator.hpp diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp index edb6fc7c8b..db1236a9b6 100644 --- a/src/surf/ns3/ns3_simulator.hpp +++ b/src/surf/ns3/ns3_simulator.hpp @@ -7,18 +7,13 @@ #define NS3_SIMULATOR_HPP #include "simgrid/s4u/Host.hpp" +#include "src/surf/network_ns3.hpp" #include #include #include -namespace simgrid { -namespace surf { -class NetworkNS3Action; -} -} // namespace simgrid - class NetPointNs3 { public: static simgrid::xbt::Extension EXTENSION_ID; @@ -37,7 +32,7 @@ XBT_PUBLIC void ns3_add_cluster(const char* id, double bw, double lat); class XBT_PRIVATE SgFlow { public: - SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action); + SgFlow(uint32_t totalBytes, simgrid::kernel::resource::NetworkNS3Action* action); // private: std::uint32_t bufferedBytes_ = 0; @@ -45,7 +40,7 @@ public: std::uint32_t remaining_; std::uint32_t totalBytes_; bool finished_ = false; - simgrid::surf::NetworkNS3Action* action_; + simgrid::kernel::resource::NetworkNS3Action* action_; }; void StartFlow(ns3::Ptr sock, const char* to, uint16_t port_number);