Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / mc / mc_base.h

diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index a37b947..5d9baa0 100644 (file)
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -7,15 +7,19 @@
 #ifndef SIMGRID_MC_BASE_H
 #define SIMGRID_MC_BASE_H
 
+#ifdef __cplusplus
+#include <vector>
+#endif
+
 #include <xbt/base.h>
-#include "src/simix/popping_private.h" // smx_simcall_t
+#include <simgrid/forward.h>
 
 #ifdef __cplusplus
 
 namespace simgrid {
 namespace mc {
 
-/** Can this requests can be executed.
+/** Can this requests can be executed?
  *
  *  Most requests are always enabled but WAIT and WAITANY
  *  are not always enabled: a WAIT where the communication does not
@@ -35,7 +39,7 @@ XBT_PRIVATE void wait_for_requests(void);
 XBT_PRIVATE extern std::vector<double> processes_time;
 
 /** Execute a given simcall */
-XBT_PRIVATE void handle_simcall(smx_simcall_t req, int value);
+XBT_PRIVATE void handle_simcall(smx_simcall_t req, int req_num);
 
 /** Check if the given simcall is visible
  *