[mc] C++ify RegionType, StorageType enums

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

diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp
index 1f11579..a037f84 100644 (file)
--- a/src/mc/mc_diff.cpp
+++ b/src/mc/mc_diff.cpp
@@ -421,7 +421,7 @@ mc_mem_region_t MC_get_heap_region(mc_snapshot_t snapshot)
   size_t n = snapshot->snapshot_regions_count;
   for (size_t i=0; i!=n; ++i) {
     mc_mem_region_t region = snapshot->snapshot_regions[i];
-    if (region->region_type == MC_REGION_TYPE_HEAP)
+    if (region->region_type() == simgrid::mc::RegionType::Heap)
       return region;
   }
   xbt_die("No heap region");
@@ -825,10 +825,8 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, int process_i
       addr_pointed2 = snapshot2->read(
         remote((void**)((char *) real_area2 + pointer_align)), process_index);
 
-      if (addr_pointed1 > process->maestro_stack_start
-          && addr_pointed1 < process->maestro_stack_end
-          && addr_pointed2 > process->maestro_stack_start
-          && addr_pointed2 < process->maestro_stack_end) {
+      if (process->in_maestro_stack(remote(addr_pointed1))
+        && process->in_maestro_stack(remote(addr_pointed2))) {
         i = pointer_align + sizeof(void *);
         continue;
       } else if (addr_pointed1 > state->std_heap_copy.heapbase