Merging changes done by Steven, Samuel and Luka, regarding simulation of StarPU-MPI

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

diff --git a/src/surf/vm_hl13.hpp b/src/surf/vm_hl13.hpp
index 311c0f82660d9266730a3cd6d3f45a2406a8db7f..411620d99beed9e1ba05483b6eeecdc53dbdb5be 100644 (file)
--- a/src/surf/vm_hl13.hpp
+++ b/src/surf/vm_hl13.hpp
@@ -7,7 +7,7 @@
 #include "xbt/base.h"
 
 #include "host_clm03.hpp"
-#include "vm_interface.hpp"
+#include "virtual_machine.hpp"
 
 #ifndef SURF_VM_HPP_
 #define SURF_VM_HPP_
@@ -15,6 +15,9 @@
 #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.
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
@@ -30,7 +33,7 @@ public:
   VMHL13Model();
   ~VMHL13Model(){};
 
-  VM *createVM(const char *name, surf_resource_t host_PM);
+  VirtualMachine *createVM(const char *name, surf_resource_t host_PM);
   double shareResources(double now);
   void adjustWeightOfDummyCpuActions() {};
   Action *executeParallelTask(int host_nb,
@@ -45,7 +48,7 @@ public:
  * Resource *
  ************/
 
-class VMHL13 : public VM {
+class VMHL13 : public VirtualMachine {
 public:
   VMHL13(VMModel *model, const char* name, xbt_dict_t props, surf_resource_t host_PM);
   ~VMHL13();
@@ -78,4 +81,7 @@ public:
  * Action *
  **********/
 
+}
+}
+
 #endif /* SURF_VM_HPP_ */