X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd05fcfa9ff6df9b054060937165d422a536bd99..6c619fe932602290423c6a789c2aa034ae9f1cad:/src/surf/HostImpl.hpp diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index f31677ad54..b02cb265e2 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -52,7 +52,7 @@ public: HostModel() : Model() {} ~HostModel() override {} - HostImpl *createHost(const char *name, NetCard *net, Cpu *cpu); + HostImpl *createHost(const char *name, kernel::routing::NetCard *net, Cpu *cpu); virtual void adjustWeightOfDummyCpuActions(); virtual Action *executeParallelTask(int host_nb, sg_host_t *host_list, @@ -75,7 +75,6 @@ public: static simgrid::xbt::Extension EXTENSION_ID; public: - static void classInit(); // must be called before the first use of that class /** * @brief Host constructor * @@ -229,7 +228,7 @@ public: public: xbt_dynar_t p_storage; Cpu *p_cpu; - simgrid::s4u::Host* p_host = nullptr; + simgrid::s4u::Host* piface = nullptr; /** @brief Get the list of virtual machines on the current Host */ xbt_dynar_t getVms(); @@ -240,7 +239,7 @@ public: void getParams(vm_params_t params); /** @brief Sets the params of that VM/PM */ void setParams(vm_params_t params); - simgrid::s4u::Host* getHost() { return p_host; } + simgrid::s4u::Host* getHost() { return piface; } private: s_vm_params_t p_params; };