Compile trace_mgr with g++. Next step: objectification

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

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index be3b561..d6d3159 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -6,8 +6,8 @@
 
 #include <xbt/base.h>
 
-#include "cpu_interface.hpp"
-#include "trace_mgr_private.h"
+#include "src/surf/cpu_interface.hpp"
+#include "src/surf/trace_mgr.hpp"
 #include "surf/surf_routing.h"
 
 /* Epsilon */
@@ -118,7 +118,7 @@ public:
         int initiallyOn, tmgr_trace_t stateTrace) ;
   ~CpuTi();
 
-  void updateState(tmgr_trace_event_t event_type, double value, double date) override;
+  void updateState(tmgr_trace_iterator_t event_type, double value, double date) override;
   void updateActionsFinishTime(double now);
   bool isUsed() override;
   CpuAction *execute(double size) override;
@@ -128,8 +128,8 @@ public:
   void modified(bool modified);
 
   CpuTiTgmr *p_availTrace;       /*< Structure with data needed to integrate trace file */
-  tmgr_trace_event_t p_stateEvent = NULL; /*< trace file with states events (ON or OFF) */
-  tmgr_trace_event_t p_speedEvent = NULL; /*< trace file with availability events */
+  tmgr_trace_iterator_t p_stateEvent = NULL; /*< trace file with states events (ON or OFF) */
+  tmgr_trace_iterator_t p_speedEvent = NULL; /*< trace file with availability events */
   ActionTiList *p_actionSet;        /*< set with all actions running on cpu */
   double m_sumPriority;          /*< the sum of actions' priority that are running on cpu */
   double m_lastUpdate = 0;       /*< last update of actions' remaining amount done */
@@ -156,7 +156,7 @@ public:
                           int pstate, double speedScale,
                           tmgr_trace_t speedTrace, int core,
                           int initiallyOn,
-                          tmgr_trace_t state_trace);
+                          tmgr_trace_t state_trace) override;
   double shareResources(double now) override;
   void updateActionsState(double now, double delta) override;
   void addTraces() override;