Replace "XBT_PUBLIC_CLASS" with "class XBT_PUBLIC".

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

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 553fffa..95255c5 100644 (file)
--- 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. */
@@ -16,8 +16,6 @@
 #define GUESTOS_NOISE 100 // This value corresponds to the cost of the global action associated to the VM
                           // It corresponds to the cost of a VM running no tasks.
 
-typedef struct s_dirty_page* dirty_page_t;
-
 namespace simgrid {
 namespace vm {
 
@@ -29,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:
@@ -57,11 +54,8 @@ public:
 
   virtual void setBound(double bound);
 
-  void getParams(vm_params_t params);
-  void setParams(vm_params_t params);
-
   /* 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);
@@ -89,7 +83,6 @@ public:
 
 private:
   simgrid::s4u::Host* hostPM_;
-  s_vm_params_t params_;
   int coreAmount_;
   size_t ramsize_            = 0;
   e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;