X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9436b840852218b39dce22d6057b6f223168daa..da6a8948438ab0798f492ed7bf5dad2a515ca04e:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 334e3b85db..0cc7c2a784 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -13,8 +13,8 @@ #include #include -#include -#include +#include "xbt/dynar.h" +#include "xbt/sysdep.h" #include #include @@ -29,7 +29,6 @@ #endif #include "src/mc/mc_forward.hpp" -#include "src/mc/mc_safety.h" #include "src/mc/mc_private.h" #include "src/mc/mc_smx.h" #include "src/mc/mc_dwarf.hpp" @@ -1364,9 +1363,7 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, if (addr_pointed1 > process->heap_address && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)) { - if (! - (addr_pointed2 > process->heap_address - && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2))) + if (not(addr_pointed2 > process->heap_address && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2))) return 1; // The pointers are both in the heap: return simgrid::mc::compare_heap_area(state,