X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/116bb3cc2f279ab41c1aaa141c95aa21c31e1019..f32336ba61cacec6b0bbd33b90e532f6678748fc:/src/surf/network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 7b18dca3e7..ed65cac5a8 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team.  All rights reserved.         */
+/* Copyright (c) 2004-2019. 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. */
@@ -20,7 +20,7 @@ public:
   ~NetworkNS3Model();
   LinkImpl* create_link(const std::string& name, double bandwidth, double latency,
                         s4u::Link::SharingPolicy policy) override;
-  kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
+  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
   double next_occuring_event(double now) override;
   bool next_occuring_event_is_idempotent() override { return false; }
   void update_actions_state(double now, double delta) override;
@@ -34,11 +34,11 @@ public:
   explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency);
   ~LinkNS3();
 
-  void apply_event(tmgr_trace_event_t event, double value) override;
+  void apply_event(profile::Event* event, double value) override;
   void set_bandwidth(double value) override { THROW_UNIMPLEMENTED; }
   void set_latency(double value) override { THROW_UNIMPLEMENTED; }
-  void set_bandwidth_trace(tmgr_trace_t trace) override;
-  void set_latency_trace(tmgr_trace_t trace) override;
+  void set_bandwidth_profile(profile::Profile* profile) override;
+  void set_latency_profile(profile::Profile* profile) override;
 };
 
 /**********
@@ -46,11 +46,11 @@ public:
  **********/
 class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(kernel::resource::Model* model, double cost, s4u::Host* src, s4u::Host* dst);
+  NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst);
 
   void suspend() override;
   void resume() override;
-  std::list<LinkImpl*> links() override;
+  std::list<LinkImpl*> links() const override;
   void update_remains_lazy(double now) override;
 
   // private:
@@ -60,7 +60,7 @@ public:
 };
 
 } // namespace resource
-}
-}
+} // namespace kernel
+} // namespace simgrid
 
 #endif /* NETWORK_NS3_HPP_ */