Merge with master and fix conflicts

[simgrid.git] / src / surf / workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index c1de8ae..34b9b81 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -483,7 +483,6 @@ void surf_workstation_model_init_current_default(void)
   xbt_dynar_push(model_list, &surf_workstation_model);
   xbt_dynar_push(model_list_invoke, &surf_workstation_model);
   sg_platf_host_add_cb(workstation_new);
-//  sg_platf_postparse_add_cb(create_workstations);
 }
 
 void surf_workstation_model_init_compound()
@@ -495,5 +494,4 @@ void surf_workstation_model_init_compound()
   xbt_dynar_push(model_list, &surf_workstation_model);
   xbt_dynar_push(model_list_invoke, &surf_workstation_model);
   sg_platf_host_add_cb(workstation_new);
-//  sg_platf_postparse_add_cb(create_workstations);
 }