From: alebre <adrien.lebre@inria.fr>
Date: Thu, 31 Jan 2013 20:57:05 +0000 (+0100)
Subject: Fix conflict - Adrien
X-Git-Tag: v3_11_beta~297^2^2~118
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0d0ad166ad6666d099d13c62c840159ce7f3270e

Fix conflict - Adrien
---

0d0ad166ad6666d099d13c62c840159ce7f3270e
diff --cc src/surf/vm_workstation.c
index d5ef52aca5,d5cb5d61a0..00d9dc5286
--- a/src/surf/vm_workstation.c
+++ b/src/surf/vm_workstation.c
@@@ -49,15 -49,16 +50,16 @@@ static void vm_ws_destroy(smx_host_t ho
  	/* this will call surf_resource_free() */
  	xbt_lib_unset(host_lib, name, SURF_WKS_LEVEL);
  
- 	xbt_free(workstation);
+ 	xbt_free(vm_ws->generic_resource.name);
+ 	xbt_free(vm_ws);
  }
  
 -static int vm_ws_get_state(void *vm_ws){
 -	return ((workstation_VM2013_t)vm_ws)->current_state;
 +static int vm_ws_get_state(void *ind_vm_ws){
 +	return ((workstation_VM2013_t) surf_workstation_resource_priv(ind_vm_ws))->current_state;
  }
  
 -static void vm_ws_set_state(void *vm_ws, int state){
 -	 ((workstation_VM2013_t)vm_ws)->current_state=state;
 +static void vm_ws_set_state(void *ind_vm_ws, int state){
 +	 ((workstation_VM2013_t) surf_workstation_resource_priv(ind_vm_ws))->current_state=state;
  }
  static void surf_vm_workstation_model_init_internal(void)
  {