Update with newer flexml.

[simgrid.git] / src / xbt / swag.c

diff --git a/src/xbt/swag.c b/src/xbt/swag.c
index 70a8f08..1a75c7f 100644 (file)
--- a/src/xbt/swag.c
+++ b/src/xbt/swag.c
@@ -100,7 +100,7 @@ XBT_INLINE void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
     swag->tail = obj;
     swag->count++;
   }
-  else if (obj != swag->head && !xbt_swag_getPrev(obj, swag->offset)) {
+  else if (obj != swag->tail && !xbt_swag_getNext(obj, swag->offset)) {
     xbt_swag_getPrev(obj, swag->offset) = swag->tail;
     xbt_swag_getNext(swag->tail, swag->offset) = obj;
     swag->tail = obj;
@@ -218,8 +218,9 @@ XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
   xbt_swag_insert(obj2, setA);
   xbt_swag_insert(obj2, setB);
 
-  xbt_swag_remove(obj1, setB);
-  /*  xbt_swag_remove(obj2, setB); */
+  xbt_test_assert(xbt_swag_remove(NULL, setB) == NULL);
+  xbt_test_assert(xbt_swag_remove(obj1, setB) == obj1);
+  /*  xbt_test_assert(xbt_swag_remove(obj2, setB) == obj2); */
 
   xbt_test_add("Traverse set A");
   xbt_swag_foreach(obj, setA) {