move the definition of resource's Metric as an inner class

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

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index a7c2202c99c3d549b886d76798abb6a3adb14c9d..b256781e7afeaf2b91f8a487d13c2352c5f44dae 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -40,9 +40,9 @@ public:
   CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
   ~CpuCas01() override;
   void apply_event(tmgr_trace_event_t event, double value) override;
-  CpuAction *execution_start(double size) override;
+  CpuAction* execution_start(double size) override;
   CpuAction* execution_start(double size, int requestedCore) override;
-  CpuAction *sleep(double duration) override;
+  CpuAction* sleep(double duration) override;
 
   bool isUsed() override;
 
@@ -59,8 +59,9 @@ class CpuCas01Action: public CpuAction {
   friend CpuAction *CpuCas01::execution_start(double size);
   friend CpuAction *CpuCas01::sleep(double duration);
 public:
-  CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint, int coreAmount);
-  CpuCas01Action(Model *model, double cost, bool failed, double speed, lmm_constraint_t constraint);
+  CpuCas01Action(Model* model, double cost, bool failed, double speed, kernel::lmm::Constraint* constraint,
+                 int coreAmount);
+  CpuCas01Action(Model* model, double cost, bool failed, double speed, kernel::lmm::Constraint* constraint);
   ~CpuCas01Action() override;
   int requestedCore();