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

diff --cc src/simix/smx_network.cpp
index d638e5f,981fe60..36da572
--- 1/src/simix/smx_network.cpp
--- 2/src/simix/smx_network.cpp
+++ b/src/simix/smx_network.cpp
@@@ -394,10 -435,10 +394,10 @@@ smx_synchro_t SIMIX_comm_irecv(smx_proc
       * ourself so that the other side also gets a chance of choosing if it wants to match with us.
       *
       * If it is not found then push our communication into the rendez-vous point */
 -    other_synchro = SIMIX_deque_get_filtered(mbox->comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro);
 +    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 {