give s_val PJ_value as a constructor

[simgrid.git] / src / surf / cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 90f93fe..3f0fc96 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -10,7 +10,6 @@
 
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
-#include "surf/surf_routing.h"
 
 /* Epsilon */
 #define EPSILON 0.000000001
@@ -93,13 +92,13 @@ public:
   void suspend() override;
   void resume() override;
   void setMaxDuration(double duration) override;
-  void setPriority(double priority) override;
+  void setSharingWeight(double priority) override;
   double getRemains() override;
 
   CpuTi *cpu_;
   int indexHeap_ = -1;
   int suspended_ = 0;
-public:
+
   boost::intrusive::list_member_hook<> action_ti_hook;
 };
 
@@ -116,7 +115,7 @@ public:
 
   void setSpeedTrace(tmgr_trace_t trace) override;
 
-  void apply_event(tmgr_trace_iterator_t event, double value) override;
+  void apply_event(tmgr_trace_event_t event, double value) override;
   void updateActionsFinishTime(double now);
   void updateRemainingAmount(double now);
 
@@ -134,7 +133,6 @@ public:
 
   double currentFrequency_;
 
-public:
   boost::intrusive::list_member_hook<> cpu_ti_hook;
 };