From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 22 Apr 2016 18:55:39 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_13~34^2~28
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/59a1cb7b07e16f70c90ac11398fde26a52f749e4?hp=9c45d9a5f482ce196c4ebd579a68b508e24af43b

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

diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc
index 38eb09172f..5a0f1631c0 100644
--- a/doc/doxygen/install.doc
+++ b/doc/doxygen/install.doc
@@ -393,8 +393,9 @@ CXXFLAGS=-m32 \
 PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu/pkgconfig/ \
 cmake . \
 -DCMAKE_SYSTEM_PROCESSOR=i386 \
--DCMAKE_Fortran_COMPILE=/some/path/to/i686-linux-gnu-gfortran \
--DGFORTRAN_EXE=/some/path/to/i686-linux-gnu-gfortran
+-DCMAKE_Fortran_COMPILER=/some/path/to/i686-linux-gnu-gfortran \
+-DGFORTRAN_EXE=/some/path/to/i686-linux-gnu-gfortran \
+-DCMAKE_Fortran_FLAGS=-m32
 @endverbatim
 
 where i686-linux-gnu-gfortran can be implemented as:
diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp
index d638e5fbd7..36da57293f 100644
--- a/src/simix/smx_network.cpp
+++ b/src/simix/smx_network.cpp
@@ -397,7 +397,7 @@ smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox, void
     other_synchro = _extract_matching_comm(mbox->comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro);
 
     if (!other_synchro) {
-      XBT_DEBUG("Receive pushed first %lu", mbox->comm_queue->size());
+      XBT_DEBUG("Receive pushed first %zu", mbox->comm_queue->size());
       other_synchro = this_synchro;
       SIMIX_mbox_push(mbox, this_synchro);
     } else {