merge conflicts

[simgrid.git] / examples / msg / priority / priority.c

diff --git a/examples/msg/priority/priority.c b/examples/msg/priority/priority.c
index 9c5eb23..48aaeaf 100644 (file)
--- a/examples/msg/priority/priority.c
+++ b/examples/msg/priority/priority.c
@@ -20,7 +20,7 @@ static int test(int argc, char *argv[])
   double priority = 1.0;
   m_task_t task = NULL;
 
-  int res = sscanf(argv[1], "%lg", &computation_amount);
+  _XBT_GNUC_UNUSED int res = sscanf(argv[1], "%lg", &computation_amount);
   xbt_assert(res, "Invalid argument %s\n", argv[1]);
   res = sscanf(argv[2], "%lg", &priority);
   xbt_assert(res, "Invalid argument %s\n", argv[2]);