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 branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
100e0fb
..
728da6f
100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-182,7
+182,7
@@
static void SIMIX_clean(void)
*/
XBT_INLINE double SIMIX_get_clock(void)
{
- if(MC_
IS_ENABLED
){
+ if(MC_
is_active()
){
return MC_process_clock_get(SIMIX_process_self());
}else{
return surf_get_clock();