X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb9610fbdbfac640b40d9860ef98dfaa7aab6f55..54e35ebda7e4ffacd769653b8ebb8ba93c7298bf:/src/surf/vm_hl13.hpp

diff --git a/src/surf/vm_hl13.hpp b/src/surf/vm_hl13.hpp
index 397bac591d..41b06ef800 100644
--- a/src/surf/vm_hl13.hpp
+++ b/src/surf/vm_hl13.hpp
@@ -18,10 +18,7 @@
  ***********/
 
 class VMHL13Model;
-typedef VMHL13Model *VMHL13ModelPtr;
-
 class VMHL13;
-typedef VMHL13 *VMHL13Ptr;
 
 /*********
  * Model *
@@ -31,11 +28,11 @@ public:
   VMHL13Model();
   ~VMHL13Model(){};
 
-  VMPtr createVM(const char *name, surf_resource_t host_PM);
+  VM *createVM(const char *name, surf_resource_t host_PM);
   double shareResources(double now);
   void adjustWeightOfDummyCpuActions() {};
-  ActionPtr communicate(HostPtr src, HostPtr dst, double size, double rate);
-  ActionPtr executeParallelTask(int host_nb,
+  Action *communicate(Host *src, Host *dst, double size, double rate);
+  Action *executeParallelTask(int host_nb,
                                           void **host_list,
                                           double *flops_amount,
                                           double *bytes_amount,
@@ -49,7 +46,7 @@ public:
 
 class VMHL13 : public VM {
 public:
-  VMHL13(VMModelPtr model, const char* name, xbt_dict_t props, surf_resource_t host_PM);
+  VMHL13(VMModel *model, const char* name, xbt_dict_t props, surf_resource_t host_PM);
   ~VMHL13();
 
   void suspend();
@@ -66,14 +63,14 @@ public:
   surf_resource_t getPm(); // will be vm_ws_get_pm()
 
   void setBound(double bound);
-  void setAffinity(CpuPtr cpu, unsigned long mask);
+  void setAffinity(Cpu *cpu, unsigned long mask);
 
   //FIXME: remove
   void updateState(tmgr_trace_event_t event_type, double value, double date);
   bool isUsed();
 
-  ActionPtr execute(double size);
-  ActionPtr sleep(double duration);
+  Action *execute(double size);
+  Action *sleep(double duration);
 };
 
 /**********