X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22a45a8d97ef0f1211ee05f9c16d7d90b37cf33b..fd2865e1ce63170aba3f6d6dcfe6b007c52e8cba:/src/surf/cpu_cas01.hpp diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp index ba1f13d7bc..99cbea69e6 100644 --- a/src/surf/cpu_cas01.hpp +++ b/src/surf/cpu_cas01.hpp @@ -3,9 +3,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include - #include "cpu_interface.hpp" +#include "xbt/base.h" /*********** * Classes * @@ -24,7 +23,7 @@ class XBT_PRIVATE CpuCas01Action; class CpuCas01Model : public simgrid::surf::CpuModel { public: - CpuCas01Model(kernel::resource::Model::UpdateAlgo algo); + explicit CpuCas01Model(kernel::resource::Model::UpdateAlgo algo); ~CpuCas01Model() override; Cpu *createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) override; @@ -44,7 +43,7 @@ public: CpuAction* execution_start(double size, int requestedCore) override; CpuAction* sleep(double duration) override; - bool isUsed() override; + bool is_used() override; std::vector * getSpeedPeakList(); // FIXME: killme to hide our internals @@ -64,10 +63,10 @@ public: CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, kernel::lmm::Constraint* constraint); ~CpuCas01Action() override; - int requestedCore(); + int requested_core(); private: - int requestedCore_ = 1; + int requested_core_ = 1; }; }