Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into tomerge

[simgrid.git] / src / mc / RegionSnapshot.cpp

diff --git a/src/mc/RegionSnapshot.cpp b/src/mc/RegionSnapshot.cpp
index 3d1daa4dbc4db2434ab64b927f278527beba1b6d..4a6e63f573f701a6f1f93f0d500ae67ae5e56128 100644 (file)
--- a/src/mc/RegionSnapshot.cpp
+++ b/src/mc/RegionSnapshot.cpp
@@ -19,7 +19,7 @@ namespace simgrid {
 namespace mc {
 
 RegionSnapshot dense_region(
-  mc_region_type_t region_type,
+  RegionType region_type,
   void *start_addr, void* permanent_addr, size_t size)
 {
   std::vector<char> data(size);
@@ -44,7 +44,7 @@ RegionSnapshot dense_region(
  * @param size         Size of the data*
  */
 RegionSnapshot region(
-  mc_region_type_t type, void *start_addr, void* permanent_addr, size_t size)
+  RegionType type, void *start_addr, void* permanent_addr, size_t size)
 {
   if (_sg_mc_sparse_checkpoint) {
     return sparse_region(type, start_addr, permanent_addr, size);
@@ -53,10 +53,10 @@ RegionSnapshot region(
   }
 }
 
-RegionSnapshot sparse_region(mc_region_type_t region_type,
+RegionSnapshot sparse_region(RegionType region_type,
   void *start_addr, void* permanent_addr, size_t size)
 {
-  mc_process_t process = &mc_model_checker->process();
+  simgrid::mc::Process* process = &mc_model_checker->process();
 
   xbt_assert((((uintptr_t)start_addr) & (xbt_pagesize-1)) == 0,
     "Not at the beginning of a page");