avoid warnings with SMPI + MC asserts

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index ebca312..b2c6e2b 100644 (file)
--- a/include/smpi/mpi.h
+++ b/include/smpi/mpi.h
@@ -19,7 +19,7 @@
 
 #if SIMGRID_HAVE_MC
 #undef assert
-#define assert(x) MC_assert(x)
+#define assert(x) MC_assert((int)(x))
 #endif
 
 #ifdef TRACE_CALL_LOCATION /* Defined by smpicc on the command line */

diff --git a/teshsuite/smpi/mpich3-test/io/simple_collective.c b/teshsuite/smpi/mpich3-test/io/simple_collective.c
index 82c3b4d..2acc2bc 100644 (file)
--- a/teshsuite/smpi/mpich3-test/io/simple_collective.c
+++ b/teshsuite/smpi/mpich3-test/io/simple_collective.c
@@ -148,7 +148,7 @@ static int parse_args(int argc, char **argv)
     }
 
     opt_file = strdup(argv[optind]);
-    assert(opt_file);
+    assert(opt_file!=NULL);
 
     return (0);
 }