A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deactivate this assert again.
[simgrid.git]
/
include
/
xbt
/
dict.h
diff --git
a/include/xbt/dict.h
b/include/xbt/dict.h
index
8a26fc5
..
056dc8f
100644
(file)
--- a/
include/xbt/dict.h
+++ b/
include/xbt/dict.h
@@
-1,6
+1,6
@@
/* xbt/dict.h -- api to a generic dictionary */
/* xbt/dict.h -- api to a generic dictionary */
-/* Copyright (c) 2004
, 2005, 2006, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2011
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-43,8
+43,9
@@
SG_BEGIN_DECL()
*/
/** \brief Dictionary data type (opaque structure) */
*/
/** \brief Dictionary data type (opaque structure) */
-typedef struct
xbt_dict_
*xbt_dict_t;
+typedef struct
s_xbt_dict
*xbt_dict_t;
XBT_PUBLIC(xbt_dict_t) xbt_dict_new(void);
XBT_PUBLIC(xbt_dict_t) xbt_dict_new(void);
+XBT_PUBLIC(xbt_dict_t) xbt_dict_new_homogeneous(void_f_pvoid_t free_ctn);
XBT_PUBLIC(void) xbt_dict_free(xbt_dict_t * dict);
XBT_PUBLIC(unsigned int) xbt_dict_size(xbt_dict_t dict);
XBT_PUBLIC(void) xbt_dict_free(xbt_dict_t * dict);
XBT_PUBLIC(unsigned int) xbt_dict_size(xbt_dict_t dict);
@@
-90,12
+91,12
@@
XBT_PUBLIC(void *) xbt_dict_get_or_null_ext(xbt_dict_t dict,
XBT_PUBLIC(void) xbt_dict_remove_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);
-
+#ifdef XBT_USE_DEPRECATED
XBT_PUBLIC(void) xbt_dicti_set(xbt_dict_t dict, uintptr_t key,
uintptr_t data);
XBT_PUBLIC(uintptr_t) xbt_dicti_get(xbt_dict_t dict, uintptr_t key);
XBT_PUBLIC(void) xbt_dicti_remove(xbt_dict_t dict, uintptr_t key);
XBT_PUBLIC(void) xbt_dicti_set(xbt_dict_t dict, uintptr_t key,
uintptr_t data);
XBT_PUBLIC(uintptr_t) xbt_dicti_get(xbt_dict_t dict, uintptr_t key);
XBT_PUBLIC(void) xbt_dicti_remove(xbt_dict_t dict, uintptr_t key);
-
+#endif
/** @} */
/** @defgroup XBT_dict_curs Cursors on dictionaries
/** @} */
/** @defgroup XBT_dict_curs Cursors on dictionaries
@@
-120,12
+121,11
@@
XBT_PUBLIC(void) xbt_dicti_remove(xbt_dict_t dict, uintptr_t key);
* @{ */
/** @brief Cursor on dictionaries (opaque type) */
* @{ */
/** @brief Cursor on dictionaries (opaque type) */
-typedef struct
xbt_dict_cursor_
*xbt_dict_cursor_t;
+typedef struct
s_xbt_dict_cursor
*xbt_dict_cursor_t;
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);
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);
-XBT_INLINE XBT_PUBLIC(void) xbt_dict_cursor_rewind(xbt_dict_cursor_t
- cursor);
+XBT_PUBLIC(void) xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor);
XBT_PUBLIC(char *) xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor);
XBT_PUBLIC(char *) xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor);
@@
-136,7
+136,7
@@
XBT_PUBLIC(void) xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor,
XBT_PUBLIC(void) xbt_dict_cursor_first(const xbt_dict_t dict,
xbt_dict_cursor_t * cursor);
XBT_PUBLIC(void) xbt_dict_cursor_first(const xbt_dict_t dict,
xbt_dict_cursor_t * cursor);
-XBT_
INLINE XBT_
PUBLIC(void) xbt_dict_cursor_step(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
XBT_PUBLIC(int) xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor,
char **key, void **data);
/** @def xbt_dict_foreach
@@
-147,6
+147,8
@@
XBT_PUBLIC(int) xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor,
xbt_dict_cursor_step(cursor) )
/** @} */
xbt_dict_cursor_step(cursor) )
/** @} */
+
+#ifdef XBT_USE_DEPRECATED
/** @defgroup XBT_dict_multi Multi-level dictionaries
* @ingroup XBT_dict
*
/** @defgroup XBT_dict_multi Multi-level dictionaries
* @ingroup XBT_dict
*
@@
-160,12
+162,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,
/*----[ xbt_multidict_set ]--------------------------------------------------*/
XBT_PUBLIC(void)
xbt_multidict_set(xbt_dict_t mdict,
@@
-189,6
+185,7
@@
XBT_PUBLIC(void) xbt_multidict_remove_ext(xbt_dict_t mdict,
xbt_dynar_t lens);
/** @} */
xbt_dynar_t lens);
/** @} */
+#endif
SG_END_DECL()
#endif /* _XBT_DICT_H */
SG_END_DECL()
#endif /* _XBT_DICT_H */