Merge back master branch

[simgrid.git] / examples / gras / mmrpc / mmrpc.c

diff --git a/examples/gras/mmrpc/mmrpc.c b/examples/gras/mmrpc/mmrpc.c
index c64f323..8f8e882 100644 (file)
--- a/examples/gras/mmrpc/mmrpc.c
+++ b/examples/gras/mmrpc/mmrpc.c
@@ -73,7 +73,7 @@ int server(int argc, char *argv[])
     sock = gras_socket_server(port);
   }
   CATCH(e) {
-    RETHROW0("Unable to establish a server socket: %s");
+    RETHROWF("Unable to establish a server socket: %s");
   }
 
   /* 4. Register the known messages and payloads. */
@@ -126,7 +126,7 @@ int client(int argc, char *argv[])
     toserver = gras_socket_client(host, port);
   }
   CATCH(e) {
-    RETHROW0("Unable to connect to the server: %s");
+    RETHROWF("Unable to connect to the server: %s");
   }
   XBT_INFO("Connected to %s:%d.", host, port);
 
@@ -163,7 +163,7 @@ int client(int argc, char *argv[])
    */
   for (i = 0; i < MATSIZE; i++)
     for (j = 0; i < MATSIZE; i++)
-      xbt_assert4(xbt_matrix_get_as(answer, i, j, double) ==
+      xbt_assert(xbt_matrix_get_as(answer, i, j, double) ==
                   xbt_matrix_get_as(request[1], i, j, double),
                   "Answer does not match expectations. Found %f at cell %d,%d instead of %f",
                   xbt_matrix_get_as(answer, i, j, double), i, j,