move simix::ActorImpl to kernel::actor::ActorImpl

[simgrid.git] / src / plugins / vm / VirtualMachineImpl.hpp

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 3ffbfde..e567125 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -27,8 +27,7 @@ namespace vm {
  * @brief SURF VM interface class
  * @details A VM represent a virtual machine
  */
-XBT_PUBLIC_CLASS VirtualMachineImpl : public surf::HostImpl, public simgrid::xbt::Extendable<VirtualMachineImpl>
-{
+class XBT_PUBLIC VirtualMachineImpl : public surf::HostImpl, public simgrid::xbt::Extendable<VirtualMachineImpl> {
   friend simgrid::s4u::VirtualMachine;
 
 public:
@@ -36,13 +35,13 @@ public:
   ~VirtualMachineImpl();
 
   /** @brief Suspend the VM */
-  virtual void suspend(simgrid::simix::ActorImpl* issuer);
+  virtual void suspend(simgrid::kernel::actor::ActorImpl* issuer);
 
   /** @brief Resume the VM */
   virtual void resume();
 
   /** @brief Shutdown the VM */
-  virtual void shutdown(simgrid::simix::ActorImpl* issuer);
+  virtual void shutdown(simgrid::kernel::actor::ActorImpl* issuer);
 
   /** @brief Change the physical host on which the given VM is running */
   virtual void setPm(s4u::Host* dest);
@@ -107,6 +106,6 @@ public:
 }
 }
 
-XBT_PUBLIC_DATA(simgrid::vm::VMModel*) surf_vm_model;
+XBT_PUBLIC_DATA simgrid::vm::VMModel* surf_vm_model;
 
 #endif /* VM_INTERFACE_HPP_ */