X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0afad4b7e2215154531cd6b2933af898ec6b781d..f36bb244f8e4874b90572ecb44ed6e2f3fa9592b:/src/plugins/vm/VirtualMachineImpl.hpp

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 709ff69224..362409a932 100644
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -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);
@@ -56,7 +55,7 @@ public:
   virtual void setBound(double bound);
 
   /* The vm object of the lower layer */
-  surf::Action* action_ = nullptr;
+  kernel::resource::Action* action_ = nullptr;
 
   e_surf_vm_state_t getState();
   void setState(e_surf_vm_state_t state);
@@ -99,14 +98,14 @@ private:
 class XBT_PRIVATE VMModel : public surf::HostModel {
 public:
   VMModel();
-  void ignoreEmptyVmInPmLMM() override{};
+  void ignore_empty_vm_in_pm_LMM() override{};
 
-  double nextOccuringEvent(double now) override;
-  void updateActionsState(double /*now*/, double /*delta*/) override{};
+  double next_occuring_event(double now) override;
+  void update_actions_state(double /*now*/, double /*delta*/) override{};
 };
 }
 }
 
-XBT_PUBLIC_DATA(simgrid::vm::VMModel*) surf_vm_model;
+XBT_PUBLIC_DATA simgrid::vm::VMModel* surf_vm_model;
 
 #endif /* VM_INTERFACE_HPP_ */