merge conflicts resolved

[simgrid.git] / src / gras / Msg / sg_msg.c

diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c
index 0321d91..d404ecc 100644 (file)
--- a/src/gras/Msg/sg_msg.c
+++ b/src/gras/Msg/sg_msg.c
@@ -146,7 +146,7 @@ gras_msg_t gras_msg_recv_any(void)
      *    an iterator, incremented only when the socket has a comm. And we've the right socket
      *    when that iterator is equal to "got", the result of waitany. Not needed if B holds.
      */
-    xbt_assert1(sock_data->comm_recv,
+    xbt_assert(sock_data->comm_recv,
                 "Comm_recv of socket %p is empty; please report that nasty bug",
                 sock);
     /* End of paranoia */
@@ -238,7 +238,7 @@ void gras_msg_send_ext(gras_socket_t sock,
                                                 payload, msg->payl);
   }
 
-  comm = SIMIX_req_comm_isend(target_rdv, whole_payload_size, -1, msg, sizeof(void *), NULL, msg, 0);
+  comm = SIMIX_req_comm_isend(target_rdv, whole_payload_size, -1, msg, sizeof(void *), NULL,NULL, msg, 0);
   SIMIX_req_comm_wait(comm, -1);
 
   XBT_VERB("Message sent (and received)");