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
Merge conflicts in instr_routing.c
[simgrid.git]
/
src
/
include
/
mc
/
datatypes.h
diff --git
a/src/include/mc/datatypes.h
b/src/include/mc/datatypes.h
index
4c6cda3
..
da5a3ca
100644
(file)
--- a/
src/include/mc/datatypes.h
+++ b/
src/include/mc/datatypes.h
@@
-15,6
+15,8
@@
SG_BEGIN_DECL()
typedef struct s_mc_transition *mc_transition_t;
typedef struct s_mc_ignore_region{
typedef struct s_mc_transition *mc_transition_t;
typedef struct s_mc_ignore_region{
+ int block;
+ int fragment;
void *address;
size_t size;
}s_mc_ignore_region_t, *mc_ignore_region_t;
void *address;
size_t size;
}s_mc_ignore_region_t, *mc_ignore_region_t;