From 08cc32c523939ad907ffc4a0d9a260ab56798d28 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 19 Jul 2006 14:01:42 +0000
Subject: [PATCH] Add a define directly setting the correct element header,
 document it, plus some cleanups

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2624 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 include/xbt/set.h | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/include/xbt/set.h b/include/xbt/set.h
index 7af602a6a1..7ee7a12fc7 100644
--- a/include/xbt/set.h
+++ b/include/xbt/set.h
@@ -20,10 +20,22 @@ SG_BEGIN_DECL()
  * 
  *  The elements stored in such a data structure can be retrieve both by
  *  name and by ID. For this to work, the first fields of the structures
- *  stored must begin with:
- *  \verbatim unsigned int ID;
+ *  stored must begin with the following fields:
+ *  \verbatim struct {
+ unsigned int ID;
  char        *name;
- unsigned int name_len;\endverbatim
+ unsigned int name_len;
+ /* my other fields, constituting the payload */
+} my_element_type_t; \endverbatim
+ * 
+ *  Since we are casting elements around, no protection is ensured by the 
+ * compiler. It is thus safer to define the headers using the macro 
+ * defined to that extend:
+ *  \verbatim struct {
+ XBT_SET_HEADERS;
+
+ /* my other fields, constituting the payload */
+} my_element_type_t; \endverbatim
  *
  *  It is impossible to remove an element from such a data structure.
  *
@@ -40,21 +52,25 @@ SG_BEGIN_DECL()
  *  @{
  */
 /** \brief Opaque type representing a set */
-typedef struct xbt_set_ *xbt_set_t; 
+typedef struct xbt_set_ *xbt_set_t;
+
+#define XBT_SET_HEADERS \
+  unsigned int ID;      \
+  char        *name;    \
+  unsigned int name_len
+
 /** \brief It must be possible to cast set elements to this type */
-struct xbt_set_elm_ {
+typedef struct xbt_set_elm_ {
   unsigned int ID;      /**< Identificator (system assigned) */
   char        *name;    /**< Name (user assigned) */
   unsigned int name_len;/**< Length of the name */
-};
+} s_xbt_set_elm_t,*xbt_set_elm_t;
 
 /*####[ Functions ]##########################################################*/
 xbt_set_t xbt_set_new (void);
 void xbt_set_free(xbt_set_t *set);
 
 /** @} */
-typedef struct xbt_set_elm_  s_xbt_set_elm_t;
-typedef struct xbt_set_elm_ *  xbt_set_elm_t;
 /** @defgroup XBT_set_basic Sets basic usage
  *  @ingroup XBT_set
  *
-- 
2.20.1