X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78619b832b649f1057b93f209e6ce3c1fadfecb3..94e3b6ccac06f8bb1f6ab5d9c5d7e5bd8e861a8a:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 4c2fff5cda..e5b1e638f7 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2020. 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. */
@@ -10,7 +10,7 @@
 
 #include "network_interface.hpp"
 #include "xbt/graph.h"
-
+#include "xbt/string.hpp"
 
 /***********
  * Classes *
@@ -31,8 +31,8 @@ class XBT_PRIVATE NetworkSmpiModel;
 class NetworkCm02Model : public NetworkModel {
 public:
   explicit NetworkCm02Model(lmm::System* (*make_new_sys)(bool) = &lmm::make_new_maxmin_system);
-  virtual ~NetworkCm02Model() = default;
-  LinkImpl* create_link(const std::string& name, double bandwidth, double latency,
+  ~NetworkCm02Model() override = default;
+  LinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
                         s4u::Link::SharingPolicy policy) override;
   void update_actions_state_lazy(double now, double delta) override;
   void update_actions_state_full(double now, double delta) override;
@@ -47,8 +47,8 @@ class NetworkCm02Link : public LinkImpl {
 public:
   NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
                   s4u::Link::SharingPolicy policy, lmm::System* system);
-  virtual ~NetworkCm02Link() = default;
-  void apply_event(tmgr_trace_event_t event, double value) override;
+  ~NetworkCm02Link() override = default;
+  void apply_event(kernel::profile::Event* event, double value) override;
   void set_bandwidth(double value) override;
   void set_latency(double value) override;
 };
@@ -60,8 +60,8 @@ class NetworkCm02Action : public NetworkAction {
   friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
 
 public:
-  NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
-  virtual ~NetworkCm02Action() = default;
+  using NetworkAction::NetworkAction;
+  ~NetworkCm02Action() override = default;
   void update_remains_lazy(double now) override;
 };
 }