X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15822682005a67cef0250f877746f1d37fe412d4..19cd5a52131b50275fa26e0e53c4a8bd333f2937:/src/surf/ptask_L07.hpp

diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp
index 78127ce28b..3b944a36bd 100644
--- a/src/surf/ptask_L07.hpp
+++ b/src/surf/ptask_L07.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -58,9 +58,8 @@ class NetworkL07Model : public NetworkModel {
 public:
   NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys);
   ~NetworkL07Model();
-  Link* createLink(const char *name, double bandwidth, double latency,
-      e_surf_link_sharing_policy_t policy,
-      xbt_dict_t properties) override;
+  LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
+                       e_surf_link_sharing_policy_t policy) override;
 
   Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
 
@@ -74,22 +73,22 @@ public:
 class CpuL07 : public Cpu {
 public:
   CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, std::vector<double> * speedPerPstate, int core);
-  ~CpuL07();
+  ~CpuL07() override;
   bool isUsed() override;
-  void apply_event(tmgr_trace_iterator_t event, double value) override;
+  void apply_event(tmgr_trace_event_t event, double value) override;
   Action *execution_start(double size) override;
   Action *sleep(double duration) override;
 protected:
   void onSpeedChange() override;
 };
 
-class LinkL07 : public Link {
+class LinkL07 : public LinkImpl {
 public:
-  LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
-      double bandwidth, double latency, e_surf_link_sharing_policy_t policy);
-  ~LinkL07(){ };
+  LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency,
+          e_surf_link_sharing_policy_t policy);
+  ~LinkL07() override;
   bool isUsed() override;
-  void apply_event(tmgr_trace_iterator_t event, double value) override;
+  void apply_event(tmgr_trace_event_t event, double value) override;
   void setBandwidth(double value) override;
   void setLatency(double value) override;
 };
@@ -110,7 +109,7 @@ public:
 
   int unref() override;
 
-  std::vector<kernel::routing::NetCard*> * netcardList_ = new std::vector<kernel::routing::NetCard*>();
+  std::vector<s4u::Host*>* hostList_ = new std::vector<s4u::Host*>();
   double *computationAmount_;
   double *communicationAmount_;
   double latency_;