Merge pull request #1 from mquinson/master

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

diff --git a/src/surf/virtual_machine.hpp b/src/surf/virtual_machine.hpp
index c28b44d..26f3711 100644 (file)
--- a/src/surf/virtual_machine.hpp
+++ b/src/surf/virtual_machine.hpp
@@ -31,17 +31,17 @@ class XBT_PRIVATE VirtualMachine;
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM creation. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE simgrid::surf::signal<void(simgrid::surf::VirtualMachine*)> VMCreatedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMCreatedCallbacks;
 
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM destruction. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE simgrid::surf::signal<void(simgrid::surf::VirtualMachine*)> VMDestructedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMDestructedCallbacks;
 
 /** @ingroup SURF_callbacks
  * @brief Callbacks after VM State changes. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE simgrid::surf::signal<void(simgrid::surf::VirtualMachine*)> VMStateChangedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMStateChangedCallbacks;
 
 /************
  * Resource *
@@ -59,11 +59,10 @@ public:
    * @param model VMModel associated to this VM
    * @param name The name of the VM
    * @param props Dictionary of properties associated to this VM
-   * @param netElm The RoutingEdge associated to this VM
-   * @param cpu The Cpu associated to this VM
+   * @param host The host
    */
   VirtualMachine(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props,
-                       simgrid::Host *host);
+                       simgrid::s4u::Host *host);
 
   /** @brief Destructor */
   ~VirtualMachine();
@@ -91,7 +90,7 @@ public:
 
   /* The vm object of the lower layer */
   CpuAction *p_action;
-  simgrid::Host *p_hostPM;
+  simgrid::s4u::Host *p_hostPM;
 
   void turnOn() override;
   void turnOff() override;