X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..d56dcaa0f75999a72b8ad6676b64a54e4f7c4a45:/src/mc/mc_private.h

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 17982ed2c0..189e52f014 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -7,52 +7,44 @@
 #ifndef SIMGRID_MC_PRIVATE_H
 #define SIMGRID_MC_PRIVATE_H
 
+#include "simgrid_config.h"
+
 #include <sys/types.h>
 
-#include "simgrid_config.h"
 #include <stdio.h>
-#include <stdint.h>
-#include <stdbool.h>
 #ifndef WIN32
 #include <sys/mman.h>
 #endif
+
 #include <elfutils/libdw.h>
 
+#include <simgrid/msg.h>
+#include <xbt/fifo.h>
+#include <xbt/config.h>
+#include <xbt/base.h>
+
 #include "mc/mc.h"
-#include "src/mc/mc_base.h"
 #include "mc/datatypes.h"
-#include "xbt/fifo.h"
-#include "xbt/config.h"
+#include "src/mc/mc_base.h"
+
+#include "src/simix/smx_private.h"
+#include "src/xbt/mmalloc/mmprivate.h"
 
 #ifdef __cplusplus
+#include "src/mc/mc_forward.hpp"
 #include "src/xbt/memory_map.hpp"
 #endif
 
-#include "xbt/function_types.h"
-#include "xbt/mmalloc.h"
-#include "src/simix/smx_private.h"
-#include "src/xbt/mmalloc/mmprivate.h"
-#include "xbt/automaton.h"
-#include "xbt/hash.h"
-#include <simgrid/msg.h>
-#include "xbt/strbuff.h"
-#include "xbt/parmap.h"
-#include <xbt/base.h>
-
-#include "src/mc/mc_forward.h"
 #include "src/mc/mc_protocol.h"
 
 SG_BEGIN_DECL()
 
-typedef struct s_mc_function_index_item s_mc_function_index_item_t, *mc_function_index_item_t;
-
 /********************************* MC Global **********************************/
 
 XBT_PRIVATE void MC_init_dot_output();
 
 XBT_PRIVATE extern FILE *dot_output;
 XBT_PRIVATE extern const char* colors[13];
-XBT_PRIVATE extern xbt_parmap_t parmap;
 
 XBT_PRIVATE extern int user_max_depth_reached;
 
@@ -103,9 +95,15 @@ XBT_PRIVATE void MC_report_crash(int status);
 
 #ifdef __cplusplus
 
-XBT_PRIVATE void MC_find_object_address(
+namespace simgrid {
+namespace mc {
+
+XBT_PRIVATE void find_object_address(
   std::vector<simgrid::xbt::VmMap> const& maps, simgrid::mc::ObjectInformation* result);
 
+}
+}
+
 #endif
 
 SG_END_DECL()