Fix initialization order.

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

diff --git a/src/surf/workstation.cpp b/src/surf/workstation.cpp
index 19dfbd2..e1d23b9 100644 (file)
--- a/src/surf/workstation.cpp
+++ b/src/surf/workstation.cpp
@@ -30,6 +30,7 @@ void surf_workstation_model_init_current_default(void)
   xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();
+  surf_workstation_model->p_cpuModel = surf_cpu_model_pm;
 
   ModelPtr model = static_cast<ModelPtr>(surf_workstation_model);
   xbt_dynar_push(model_list, &model);
@@ -142,7 +143,7 @@ double WorkstationModel::shareResources(double now){
     return min_by_cpu;  /* probably min_by_cpu == min_by_net == -1 */
 }
 
-void WorkstationModel::updateActionsState(double now, double delta){
+void WorkstationModel::updateActionsState(double /*now*/, double /*delta*/){
   return;
 }
 
@@ -203,7 +204,7 @@ bool WorkstationCLM03::isUsed(){
   return -1;
 }
 
-void WorkstationCLM03::updateState(tmgr_trace_event_t event_type, double value, double date){
+void WorkstationCLM03::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/){
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
 }