rename simgrid::kernel::model into simgrid::kernel::resource

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

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 9a8bdde..b0ff040 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -8,6 +8,7 @@
 
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
+#include "src/kernel/model/Resource.hpp"
 
 #include <list>
 
@@ -45,7 +46,7 @@ public:
 * @brief SURF cpu resource interface class
 * @details A Cpu represent a cpu associated to a host
 */
-XBT_PUBLIC_CLASS Cpu : public simgrid::kernel::model::Resource
+XBT_PUBLIC_CLASS Cpu : public simgrid::kernel::resource::Resource
 {
 public:
   /**
@@ -134,7 +135,7 @@ public:
   virtual void setSpeedTrace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load). Trace must contain relative values (ratio between 0 and 1) */
 
   tmgr_trace_event_t stateEvent_ = nullptr;
-  s_surf_metric_t speed_ = {1.0, 0, nullptr};
+  Metric speed_                  = {1.0, 0, nullptr};
 };
 
 /**********