X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4af50b182ee0b683c2928eae98e31dbe7fd0f3e..0d5351be580847fc5bed5dac18aaa391871ec725:/teshsuite/surf/surf_usage/surf_usage.cpp

diff --git a/teshsuite/surf/surf_usage/surf_usage.cpp b/teshsuite/surf/surf_usage/surf_usage.cpp
index e0ec894599..133e3921c2 100644
--- a/teshsuite/surf/surf_usage/surf_usage.cpp
+++ b/teshsuite/surf/surf_usage/surf_usage.cpp
@@ -14,22 +14,20 @@
 #include "src/surf/cpu_interface.hpp"
 
 #include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
-                             "Messages specific for surf example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
 
-const char *string_action(e_surf_action_state_t state);
-const char *string_action(e_surf_action_state_t state)
+static const char *string_action(simgrid::surf::Action::State state)
 {
   switch (state) {
-  case (SURF_ACTION_READY):
+  case (simgrid::surf::Action::State::ready):
     return "SURF_ACTION_READY";
-  case (SURF_ACTION_RUNNING):
+  case (simgrid::surf::Action::State::running):
     return "SURF_ACTION_RUNNING";
-  case (SURF_ACTION_FAILED):
+  case (simgrid::surf::Action::State::failed):
     return "SURF_ACTION_FAILED";
-  case (SURF_ACTION_DONE):
+  case (simgrid::surf::Action::State::done):
     return "SURF_ACTION_DONE";
-  case (SURF_ACTION_NOT_IN_THE_SYSTEM):
+  case (simgrid::surf::Action::State::not_in_the_system):
     return "SURF_ACTION_NOT_IN_THE_SYSTEM";
   default:
     return "INVALID STATE";
@@ -40,8 +38,8 @@ int main(int argc, char **argv)
 {
   double now = -1.0;
   surf_init(&argc, argv);       /* Initialize some common structures */
-  xbt_cfg_set_parse(_sg_cfg_set, "cpu/model:Cas01");
-  xbt_cfg_set_parse(_sg_cfg_set, "network/model:CM02");
+  xbt_cfg_set_parse("cpu/model:Cas01");
+  xbt_cfg_set_parse("network/model:CM02");
 
   xbt_assert(argc >1, "Usage : %s platform.txt\n", argv[0]);
   parse_platform_file(argv[1]);
@@ -61,9 +59,9 @@ int main(int argc, char **argv)
   surf_action_t actionC = surf_host_sleep(hostB, 7.32);
 
   /* Use whatever calling style you want... */
-  e_surf_action_state_t stateActionA = actionA->getState(); /* When you know actionA model type */
-  e_surf_action_state_t stateActionB = actionB->getState(); /* If you're unsure about it's model type */
-  e_surf_action_state_t stateActionC = actionC->getState(); /* When you know actionA model type */
+  simgrid::surf::Action::State stateActionA = actionA->getState(); /* When you know actionA model type */
+  simgrid::surf::Action::State stateActionB = actionB->getState(); /* If you're unsure about it's model type */
+  simgrid::surf::Action::State stateActionC = actionC->getState(); /* When you know actionA model type */
 
   /* And just look at the state of these tasks */
   XBT_INFO("actionA state: %s", string_action(stateActionA));