X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02dd785d0212ccd8376c2ce4fd931942232fcafb..a9361ff5f9057e93ed0bbdfac0eab6e5ba8aeab8:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 4f70915a7f..b99ecd3dea 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -95,7 +95,6 @@ public:
   void setMaxDuration(double duration) override;
   void setPriority(double priority) override;
   double getRemains() override;
-  void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) override {};
 
   CpuTi *cpu_;
   int indexHeap_;
@@ -112,7 +111,7 @@ typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
  ************/
 class CpuTi : public Cpu {
 public:
-  CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
+  CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
   ~CpuTi() override;
 
   void setSpeedTrace(tmgr_trace_t trace) override;
@@ -128,8 +127,8 @@ public:
 
   void modified(bool modified);
 
-  CpuTiTgmr *speedIntegratedTrace_ = NULL;/*< Structure with data needed to integrate trace file */
-  ActionTiList *actionSet_ = NULL;        /*< set with all actions running on cpu */
+  CpuTiTgmr *speedIntegratedTrace_ = nullptr;/*< Structure with data needed to integrate trace file */
+  ActionTiList *actionSet_ = nullptr;        /*< set with all actions running on cpu */
   double sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */
   double lastUpdate_ = 0;  /*< last update of actions' remaining amount done */
 
@@ -149,7 +148,7 @@ class CpuTiModel : public CpuModel {
 public:
   CpuTiModel();
   ~CpuTiModel() override;
-  Cpu *createCpu(simgrid::s4u::Host *host,  xbt_dynar_t speedPerPstate, int core) override;
+  Cpu *createCpu(simgrid::s4u::Host *host,  std::vector<double>* speedPerPstate, int core) override;
   double next_occuring_event(double now) override;
   void updateActionsState(double now, double delta) override;