merge conflicts

[simgrid.git] / teshsuite / gras / datadesc / datadesc_usage.c

diff --git a/teshsuite/gras/datadesc/datadesc_usage.c b/teshsuite/gras/datadesc/datadesc_usage.c
index 10a5e8b..9327d3c 100644 (file)
--- a/teshsuite/gras/datadesc/datadesc_usage.c
+++ b/teshsuite/gras/datadesc/datadesc_usage.c
@@ -147,7 +147,7 @@ static void test_dynar_empty(gras_socket_t sock, int direction)
   write_read("xbt_dynar_of_int", &i, &j, sock, direction);
   /*  xbt_dynar_dump(j); */
   if (direction == READ || direction == COPY) {
-    xbt_assert(xbt_dynar_length(j) == 0);
+    xbt_assert(xbt_dynar_is_empty(j));
     xbt_dynar_free(&j);
   }
   xbt_dynar_free(&i);
@@ -475,12 +475,11 @@ static void test_pbio(gras_socket_t sock, int direction)
 {
   int cpt;
   int cpt2;
-  gras_datadesc_type_t pbio_type;
   pbio_t i, j;
 
   XBT_INFO
       ("---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ----");
-  pbio_type = gras_datadesc_by_symbol(s_pbio);
+  gras_datadesc_by_symbol(s_pbio); 
 
   /* Fill in that damn struct */
   i.Cnstatv = 325115;