A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
codacy
[simgrid.git]
/
src
/
mc
/
compare.cpp
diff --git
a/src/mc/compare.cpp
b/src/mc/compare.cpp
index
37ee087
..
e5a873b
100644
(file)
--- a/
src/mc/compare.cpp
+++ b/
src/mc/compare.cpp
@@
-13,8
+13,8
@@
#include <utility>
#include <unordered_set>
#include <utility>
#include <unordered_set>
-#include
<xbt/sysdep.h>
-#include
<xbt/dynar.h>
+#include
"xbt/dynar.h"
+#include
"xbt/sysdep.h"
#include <xbt/mmalloc.h>
#include <mc/mc.h>
#include <xbt/mmalloc.h>
#include <mc/mc.h>
@@
-26,6
+26,7
@@
#if HAVE_SMPI
#include "src/smpi/private.h"
#if HAVE_SMPI
#include "src/smpi/private.h"
+#include "src/smpi/private.hpp"
#endif
#include "src/mc/mc_forward.hpp"
#endif
#include "src/mc/mc_forward.hpp"
@@
-1363,9
+1364,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_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,
return 1;
// The pointers are both in the heap:
return simgrid::mc::compare_heap_area(state,
@@
-1643,7
+1642,6
@@
int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc:
XBT_DEBUG("(%d - %d) Different local variables between stacks %d", num1,
num2, cursor + 1);
errors++;
XBT_DEBUG("(%d - %d) Different local variables between stacks %d", num1,
num2, cursor + 1);
errors++;
- is_diff = 1;
#else
#ifdef MC_VERBOSE
#else
#ifdef MC_VERBOSE