Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Make it compile in mainaiter (paranoid) mode
[simgrid.git] / testsuite / xbt / swag_usage.c
index 1814724..258ae9c 100644 (file)
@@ -1,11 +1,11 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "swag.h"
+#include "xbt/swag.h"
 
 typedef struct {
   s_xbt_swag_hookup_t setA;
   s_xbt_swag_hookup_t setB;
-  char *name;
+  const char *name;
 } shmurtz, s_shmurtz_t, *shmurtz_t;
 
 int main(void)
@@ -22,8 +22,8 @@ int main(void)
   printf("%p %p %d\n",obj1,&(obj1->setB),
         (char *)&(obj1->setB) - (char *)obj1);
 
-  setA = xbt_swag_new((char *)&(obj1->setA) - (char *)obj1);
-  setB = xbt_swag_new((char *)&(obj1->setB) - (char *)obj1);
+  setA = xbt_swag_new(xbt_swag_offset(*obj1,setA));
+  setB = xbt_swag_new(xbt_swag_offset(*obj1,setB));
 
   xbt_swag_insert(obj1, setA);
   xbt_swag_insert(obj1, setB);