X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd6274487954af16de90c357090e2d698d886cd1..0bfb3cdebf6d1a0105a7a738a602015ed583a39e:/include/xbt/dict.h

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index a25f957426..dd4de16526 100644
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -44,10 +44,10 @@ SG_BEGIN_DECL()
 
   /** \brief Dictionnary data type (opaque structure) */
   typedef struct xbt_dict_ *xbt_dict_t;
-  xbt_dict_t xbt_dict_new(void);
-  xbt_dict_t xbt_dict_new_ext(int hashsize);
-  void xbt_dict_free(xbt_dict_t *dict);
-  void xbt_dict_hashsize_set(xbt_dict_t dict, int hashsize);
+  XBT_PUBLIC(xbt_dict_t) xbt_dict_new(void);
+  XBT_PUBLIC(xbt_dict_t) xbt_dict_new_ext(int hashsize);
+  XBT_PUBLIC(void) xbt_dict_free(xbt_dict_t *dict);
+  XBT_PUBLIC(void) xbt_dict_hashsize_set(xbt_dict_t dict, int hashsize);
 
 /** @} */
 /** @defgroup XBT_dict_basic Dictionnaries basic usage
@@ -58,14 +58,14 @@ SG_BEGIN_DECL()
  *  @{
  */
 
-  void  xbt_dict_set(xbt_dict_t dict, const char *key, void *data, void_f_pvoid_t *free_ctn);
-  void *xbt_dict_get(xbt_dict_t dict,const char *key);
-  void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key);
+  XBT_PUBLIC(void)  xbt_dict_set(xbt_dict_t dict, const char *key, void *data, void_f_pvoid_t *free_ctn);
+  XBT_PUBLIC(void*) xbt_dict_get(xbt_dict_t dict,const char *key);
+  XBT_PUBLIC(void*) xbt_dict_get_or_null(xbt_dict_t dict, const char *key);
 
-  void xbt_dict_remove(xbt_dict_t dict, const char *key);
-  void xbt_dict_reset(xbt_dict_t dict);
-  int xbt_dict_length(xbt_dict_t dict);
-  void xbt_dict_dump(xbt_dict_t dict, void (*output)(void*));
+  XBT_PUBLIC(void) xbt_dict_remove(xbt_dict_t dict, const char *key);
+  XBT_PUBLIC(void) xbt_dict_reset(xbt_dict_t dict);
+  XBT_PUBLIC(int) xbt_dict_length(xbt_dict_t dict);
+  XBT_PUBLIC(void) xbt_dict_dump(xbt_dict_t dict, void (*output)(void*));
   
 /** @} */
 /** @defgroup XBT_dict_nnul Dictionnaries with non-nul terminated keys
@@ -75,12 +75,12 @@ SG_BEGIN_DECL()
  *
  *  @{
  */
-  void  xbt_dict_set_ext(xbt_dict_t     dict,
+  XBT_PUBLIC(void)  xbt_dict_set_ext(xbt_dict_t     dict,
 	 	         const char     *key, int  key_len,
 		         void           *data,
 		         void_f_pvoid_t *free_ctn);
-  void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len);
-  void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len);
+  XBT_PUBLIC(void*) xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len);
+  XBT_PUBLIC(void)  xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len);
 
 
 /** @} */
@@ -107,19 +107,19 @@ SG_BEGIN_DECL()
 
   /** @brief Cursor on dictionnaries (opaque type) */
   typedef struct xbt_dict_cursor_ *xbt_dict_cursor_t;
-  xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict);
-  void               xbt_dict_cursor_free(xbt_dict_cursor_t *cursor);
+  XBT_PUBLIC(xbt_dict_cursor_t) xbt_dict_cursor_new(const xbt_dict_t dict);
+  XBT_PUBLIC(void)               xbt_dict_cursor_free(xbt_dict_cursor_t *cursor);
 
-  void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor);
+  XBT_PUBLIC(void) xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor);
 
 
-  char * xbt_dict_cursor_get_key     (xbt_dict_cursor_t cursor);
-  void * xbt_dict_cursor_get_data    (xbt_dict_cursor_t cursor);
+  XBT_PUBLIC(char *) xbt_dict_cursor_get_key     (xbt_dict_cursor_t cursor);
+  XBT_PUBLIC(void *) xbt_dict_cursor_get_data    (xbt_dict_cursor_t cursor);
 
-  void xbt_dict_cursor_first (const xbt_dict_t   dict,
+  XBT_PUBLIC(void) xbt_dict_cursor_first (const xbt_dict_t   dict,
 			     xbt_dict_cursor_t *cursor);
-  void         xbt_dict_cursor_step        (xbt_dict_cursor_t  cursor);
-  int          xbt_dict_cursor_get_or_free (xbt_dict_cursor_t *cursor,
+  XBT_PUBLIC(void)         xbt_dict_cursor_step        (xbt_dict_cursor_t  cursor);
+  XBT_PUBLIC(int)          xbt_dict_cursor_get_or_free (xbt_dict_cursor_t *cursor,
 					    char              **key,
 					    void              **data);
   /** @def xbt_dict_foreach
@@ -144,29 +144,29 @@ SG_BEGIN_DECL()
  */
 
 /** \brief To dump multicache, this function dumps a cache                           */
-void xbt_dict_print(void *data);
+XBT_PUBLIC(void) xbt_dict_print(void *data);
 /** \brief To dump multicache, this one dumps a string                               */
-void xbt_dict_prints(void *data);
+XBT_PUBLIC(void) xbt_dict_prints(void *data);
 
 
 /*----[ xbt_multidict_set ]--------------------------------------------------*/
-void
+XBT_PUBLIC(void)
 xbt_multidict_set(xbt_dict_t mdict,
                   xbt_dynar_t keys,
                   void *data,void (*free_ctn)(void*));
-void
+XBT_PUBLIC(void)
 xbt_multidict_set_ext(xbt_dict_t mdict,
                       xbt_dynar_t keys, xbt_dynar_t lens,
                       void *data,void_f_pvoid_t *free_ctn);
 
 /*----[ xbt_multidict_get ]--------------------------------------------------*/
-void *xbt_multidict_get    (xbt_dict_t mdict, xbt_dynar_t keys);
-void *xbt_multidict_get_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens);
+XBT_PUBLIC(void*) xbt_multidict_get    (xbt_dict_t mdict, xbt_dynar_t keys);
+XBT_PUBLIC(void*) xbt_multidict_get_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens);
 
 /*----[ xbt_multidict_remove ]-----------------------------------------------*/
 /*---------------------------------------------------------------------------*/
-void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys);
-void xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens);
+XBT_PUBLIC(void) xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys);
+XBT_PUBLIC(void) xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens);
 
 /** @} */