Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Fri, 22 Apr 2016 18:55:39 +0000 (20:55 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Fri, 22 Apr 2016 18:55:39 +0000 (20:55 +0200)
doc/doxygen/install.doc
src/simix/smx_network.cpp

index 38eb091..5a0f163 100644 (file)
@@ -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:
index d638e5f..36da572 100644 (file)
@@ -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 {