X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffe8ce65fd9a8e18a0469f26f067c3ea6d5d60d4..f0d9c752a61e9cbef5ffb5c4ff0ea4a7fac5cddf:/src/mc/mc_forward.h

diff --git a/src/mc/mc_forward.h b/src/mc/mc_forward.h
index bd78e99299..2cc0c34399 100644
--- a/src/mc/mc_forward.h
+++ b/src/mc/mc_forward.h
@@ -4,23 +4,67 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef MC_FORWARD_H
-#define MC_FORWARD_H
+#ifndef SIMGRID_MC_FORWARD_H
+#define SIMGRID_MC_FORWARD_H
 
+#include <xbt/misc.h>
 #include <mc/datatypes.h>
-#include "mc_interface.h"
 
-typedef struct s_mc_object_info s_mc_object_info_t, *mc_object_info_t;
-typedef struct s_dw_type s_dw_type_t, *dw_type_t;
+#ifdef __cplusplus
+
+#define MC_OVERRIDE
+
+namespace simgrid {
+namespace mc {
+
+class PageStore;
+class ModelChecker;
+class AddressSpace;
+class Process;
+class Snapshot;
+class ObjectInformation;
+class Type;
+class Variable;
+
+}
+}
+
+typedef ::simgrid::mc::ModelChecker s_mc_model_checker_t;
+typedef ::simgrid::mc::PageStore s_mc_pages_store_t;
+typedef ::simgrid::mc::AddressSpace s_mc_address_space_t;
+typedef ::simgrid::mc::Process s_mc_process_t;
+typedef ::simgrid::mc::Snapshot s_mc_snapshot_t;
+typedef ::simgrid::mc::ObjectInformation s_mc_object_info_t;
+typedef ::simgrid::mc::Type s_mc_type_t;
+typedef ::simgrid::mc::Variable s_mc_variable_t;
+
+#else
+
+typedef struct _s_mc_model_checker s_mc_model_checker_t;
+typedef struct _s_mc_pages_store s_mc_pages_store_t;
+typedef struct _s_mc_address_space_t s_mc_address_space_t;
+typedef struct _s_mc_process_t s_mc_process_t;
+typedef struct _s_mc_snapshot_t s_mc_snapshot_t;
+typedef struct _s_mc_object_info_t s_mc_object_info_t;
+typedef struct _s_mc_type_t s_mc_type_t;
+typedef struct _s_mc_variable_t s_mc_variable_t;
+
+#endif
+
 typedef struct s_memory_map s_memory_map_t, *memory_map_t;
-typedef struct s_dw_variable s_dw_variable_t, *dw_variable_t;
 typedef struct s_dw_frame s_dw_frame_t, *dw_frame_t;
 
-typedef struct s_mc_pages_store s_mc_pages_store_t, *mc_pages_store_t;
-typedef struct s_mc_snapshot s_mc_snapshot_t, *mc_snapshot_t;
+typedef s_mc_pages_store_t *mc_pages_store_t;
+typedef s_mc_model_checker_t *mc_model_checker_t;
+typedef s_mc_address_space_t *mc_address_space_t;
+typedef s_mc_process_t *mc_process_t;
+typedef s_mc_snapshot_t *mc_snapshot_t;
+typedef s_mc_object_info_t *mc_object_info_t;
+typedef s_mc_type_t *mc_type_t;
+typedef s_mc_variable_t *mc_variable_t;
 
-typedef struct s_mc_process s_mc_process_t, * mc_process_t;
-typedef struct s_mc_model_checker s_mc_model_checker_t, *mc_model_checker_t;
+SG_BEGIN_DECL()
 extern mc_model_checker_t mc_model_checker;
+SG_END_DECL()
 
 #endif