X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/365058a6f1cd1ae07157d60b7ecabe2800043ef5..76624269efc746ac7b9d89855ea9d26deff5ecee:/src/surf/HostImpl.hpp

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 5ddc32da4f..62f6178f79 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,
@@ -81,7 +81,6 @@ public:
    *
    * @param model HostModel associated to this Host
    * @param name The name of the Host
-   * @param props Dictionary of properties associated to this Host
    * @param storage The Storage associated to this Host
    * @param cpu The Cpu associated to this Host
    */
@@ -92,7 +91,6 @@ public:
    *
    * @param model HostModel associated to this Host
    * @param name The name of the Host
-   * @param props Dictionary of properties associated to this Host
    * @param constraint The lmm constraint associated to this Host if it is part of a LMM component
    * @param storage The Storage associated to this Host
    * @param cpu The Cpu associated to this Host
@@ -102,9 +100,10 @@ public:
 
   /* Host destruction logic */
   /**************************/
-  ~HostImpl();
+  ~HostImpl() override;
 
 public:
+  // Overload the method for covariant return type:
   HostModel *getModel()
   {
     return static_cast<HostModel*>(Resource::getModel());
@@ -230,7 +229,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();
@@ -241,7 +240,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;
 };