From: Augustin Degomme <adegomme@users.noreply.github.com>
Date: Wed, 11 Dec 2019 07:23:08 +0000 (+0100)
Subject: avoid warnings with SMPI + MC asserts
X-Git-Tag: v3.25~292
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2d7baec90276027a7065b6bc516cb5364aa6e061

avoid warnings with SMPI + MC asserts
---

diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h
index ebca3121a0..b2c6e2b24e 100644
--- 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 82c3b4d452..2acc2bcef8 100644
--- 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);
 }