Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / include / xbt / swag.h

diff --git a/include/xbt/swag.h b/include/xbt/swag.h
index 87bfbb6..e406066 100644 (file)
--- a/include/xbt/swag.h
+++ b/include/xbt/swag.h
@@ -110,7 +110,7 @@ XBT_PUBLIC(int) xbt_swag_size(xbt_swag_t swag);
 #define xbt_swag_getNext(obj, offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->next)
 #define xbt_swag_belongs(obj, swag) (xbt_swag_getNext((obj), (swag)->offset) || (swag)->tail == (obj))
 
-static XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag)
+static inline void *xbt_swag_getFirst(xbt_swag_t swag)
 {
   return (swag->head);
 }
@@ -189,4 +189,16 @@ static XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag)
 /* @} */
 
 SG_END_DECL()
+
+#ifdef __cplusplus
+namespace simgrid {
+namespace xbt {
+  inline void destroy(xbt_swag_t s)
+  {
+    xbt_swag_free(s);
+  }
+}
+}
+#endif
+
 #endif                          /* _XBT_SWAG_H */