X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a841dba0e3e34cff0ccd948667a339b4af9a4310..e6bc6eb53997f4648bf3207348c060e9f50ee282:/include/xbt/dict.h diff --git a/include/xbt/dict.h b/include/xbt/dict.h index 10cf467b57..1dc5685c94 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -139,14 +139,32 @@ XBT_PUBLIC(void) xbt_dict_cursor_first(const xbt_dict_t dict, 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 - @hideinitializer */ +/** @def xbt_dict_foreach + * @param dict a \ref xbt_dict_t iterator + * @param cursor an \ref xbt_dict_cursor_t used as cursor + * @param key a char* + * @param data a void** output + * @hideinitializer + * + * \note An example of usage: + * \code +xbt_dict_cursor_t cursor = NULL; +char *key; +char *data; + +xbt_dict_foreach(head, cursor, key, data) { + printf("Key %s with data %s\n",key,data); +} +\endcode + */ # define xbt_dict_foreach(dict,cursor,key,data) \ for (cursor=NULL, xbt_dict_cursor_first((dict),&(cursor)) ; \ xbt_dict_cursor_get_or_free(&(cursor),(char**)&(key),(void**)(&data));\ xbt_dict_cursor_step(cursor) ) /** @} */ + +#ifdef XBT_USE_DEPRECATED /** @defgroup XBT_dict_multi Multi-level dictionaries * @ingroup XBT_dict * @@ -160,12 +178,6 @@ XBT_PUBLIC(int) xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, * @{ */ -/** \brief To dump multicache, this function dumps a cache */ -XBT_PUBLIC(void) xbt_dict_print(void *data); -/** \brief To dump multicache, this one dumps a string */ -XBT_PUBLIC(void) xbt_dict_prints(void *data); - - /*----[ xbt_multidict_set ]--------------------------------------------------*/ XBT_PUBLIC(void) xbt_multidict_set(xbt_dict_t mdict, @@ -189,6 +201,7 @@ XBT_PUBLIC(void) xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t lens); /** @} */ +#endif SG_END_DECL() #endif /* _XBT_DICT_H */