Merge back master branch

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

diff --git a/examples/gras/mmrpc/mmrpc_client.c b/examples/gras/mmrpc/mmrpc_client.c
index 171369d..ec62e36 100644 (file)
--- a/examples/gras/mmrpc/mmrpc_client.c
+++ b/examples/gras/mmrpc/mmrpc_client.c
@@ -45,7 +45,7 @@ int client(int argc, char *argv[])
     }
     CATCH(e) {
       if (e.category != system_error)
-        RETHROW0("Unable to connect to the server: %s");
+        RETHROWF("Unable to connect to the server: %s");
       xbt_ex_free(e);
       gras_os_sleep(0.05);
     }
@@ -85,7 +85,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,