X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/269363f1bc63093972eb06e0537ca5f22ab8a53d..3622fe8cec33d2c4393be5ff35e6338d8e44472d:/src/mc/mc_state.cpp

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 566d98db3c..fdb9e10009 100644
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -8,7 +8,6 @@
 
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
-#include <xbt/fifo.h>
 
 #include "src/simix/smx_private.h"
 #include "src/mc/mc_state.h"
@@ -20,11 +19,11 @@
 
 using simgrid::mc::remote;
 
-extern "C" {
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc,
                                 "Logging specific to MC (state)");
 
+extern "C" {
+
 /**
  * \brief Creates a state data structure used by the exploration algorithm
  */
@@ -187,7 +186,7 @@ static inline smx_simcall_t MC_state_get_request_for_process(
   if (procstate->state != MC_INTERLEAVE
       && procstate->state != MC_MORE_INTERLEAVE)
       return nullptr;
-  if (!MC_process_is_enabled(process))
+  if (!simgrid::mc::process_is_enabled(process))
     return nullptr;
 
   switch (process->simcall.call) {
@@ -197,8 +196,8 @@ static inline smx_simcall_t MC_state_get_request_for_process(
         while (procstate->interleave_count <
               read_length(mc_model_checker->process(),
                 remote(simcall_comm_waitany__get__comms(&process->simcall)))) {
-          if (MC_request_is_enabled_by_idx
-              (&process->simcall, procstate->interleave_count++)) {
+          if (simgrid::mc::request_is_enabled_by_idx(&process->simcall,
+              procstate->interleave_count++)) {
             *value = procstate->interleave_count - 1;
             break;
           }
@@ -220,8 +219,8 @@ static inline smx_simcall_t MC_state_get_request_for_process(
         while (procstate->interleave_count <
                 read_length(mc_model_checker->process(),
                   remote(simcall_comm_testany__get__comms(&process->simcall))))
-          if (MC_request_is_enabled_by_idx
-              (&process->simcall, procstate->interleave_count++)) {
+          if (simgrid::mc::request_is_enabled_by_idx(&process->simcall,
+              procstate->interleave_count++)) {
             *value = procstate->interleave_count - 1;
             break;
           }