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 pull request #17 from mpoquet/master
[simgrid.git]
/
include
/
smpi
/
mpi.h
diff --git
a/include/smpi/mpi.h
b/include/smpi/mpi.h
index 0e64fdb3fb7efe07655de2bf54b8a3edc0523fbc..482fa7eba8eb980abc3963a97613aedbccaa8c79 100644
(file)
--- a/
include/smpi/mpi.h
+++ b/
include/smpi/mpi.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010
-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-10,11
+10,18
@@
#define SEED 221238
#define sleep(x) smpi_sleep(x)
#define SEED 221238
#define sleep(x) smpi_sleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x)
#include <smpi/smpi.h>
#include <xbt/sysdep.h>
#include <xbt/log.h>
#include <xbt/asserts.h>
#include <smpi/smpi.h>
#include <xbt/sysdep.h>
#include <xbt/log.h>
#include <xbt/asserts.h>
+#include <simgrid/modelchecker.h>
+
+#define gettimeofday(x, y) smpi_gettimeofday(x, NULL)
+
+#ifdef HAVE_MC
+#undef assert
+#define assert(x) MC_assert(x)
+#endif
#endif
#endif