From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Sun, 13 Mar 2016 20:08:20 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_13~451
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/aabd69e2ec25a7e7e1b6e3d7d86f531c42f4fca9

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

aabd69e2ec25a7e7e1b6e3d7d86f531c42f4fca9
diff --cc examples/smpi/NAS/ep.c
index 33aa77e7bf,28696c206c..81707f2d46
--- a/examples/smpi/NAS/ep.c
+++ b/examples/smpi/NAS/ep.c
@@@ -60,9 -70,10 +60,9 @@@ int main(int argc, char **argv) 
    if (node == root ) {
      /* Because the size of the problem is too large to store in a 32-bit integer for some classes, we put it into a
       * string (for printing). Have to strip off the decimal point put in there by the floating point print statement
 -     * (internal file)
 -     */
 +     * (internal file) */
      fprintf(stdout," NAS Parallel Benchmarks 3.2 -- EP Benchmark");
-     sprintf(size,"%zu",(unsigned long)pow(2,m+1));
+     sprintf(size,"%lu",(unsigned long)pow(2,m+1));
      //size = size.replace('.', ' ');
      fprintf(stdout," Number of random numbers generated: %s\n",size);
      fprintf(stdout," Number of active processes: %d\n",no_nodes);