X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b5e582ab2e3d739814ccfbb0cf4d2ac8078985a5..cfc676704bebcd57e5ea98bb43154245a150948f:/src/xbt/dict_cursor.c diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c index 68c5440d06..c1c52fde10 100644 --- a/src/xbt/dict_cursor.c +++ b/src/xbt/dict_cursor.c @@ -27,7 +27,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict, /** @brief Creator * @param dict the dict */ -XBT_INLINE xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict) +inline xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict) { xbt_dict_cursor_t res = NULL; @@ -43,7 +43,7 @@ XBT_INLINE xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict) * @brief Destructor * @param cursor poor victim */ -XBT_INLINE void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor) +inline void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor) { xbt_free(*cursor); *cursor = NULL; @@ -52,14 +52,14 @@ XBT_INLINE void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor) /* * Sanity check to see if the head contains something */ -static XBT_INLINE void __cursor_not_null(xbt_dict_cursor_t cursor) +static inline void __cursor_not_null(xbt_dict_cursor_t cursor) { xbt_assert(cursor, "Null cursor"); } /** @brief Reinitialize the cursor. Mandatory after removal or add in dict. */ -XBT_INLINE void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) +inline void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) { XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_cursor_rewind"); xbt_assert(cursor); @@ -78,7 +78,7 @@ XBT_INLINE void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) * @param dict on what to let the cursor iterate * @param[out] cursor dest address */ -XBT_INLINE void xbt_dict_cursor_first(const xbt_dict_t dict, +inline void xbt_dict_cursor_first(const xbt_dict_t dict, xbt_dict_cursor_t * cursor) { XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_cursor_first"); @@ -97,7 +97,7 @@ XBT_INLINE void xbt_dict_cursor_first(const xbt_dict_t dict, /** * \brief Move to the next element. */ -XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) +inline void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) { xbt_dictelm_t current; int line; @@ -133,7 +133,7 @@ XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) * * @returns true if it's ok, false if there is no more data */ -XBT_INLINE int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, +inline int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, char **key, void **data) { @@ -161,7 +161,7 @@ XBT_INLINE int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, * @param cursor: the cursor * @returns the current key */ -XBT_INLINE char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor) +inline char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor) { __cursor_not_null(cursor); @@ -173,7 +173,7 @@ XBT_INLINE char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor) * @param cursor the cursor * @returns the current data */ -XBT_INLINE void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor) +inline void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor) { __cursor_not_null(cursor); @@ -186,7 +186,7 @@ XBT_INLINE void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor) * @param data the new data * @param free_ctn the function to free the new data */ -XBT_INLINE void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor, +inline void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor, void *data, void_f_pvoid_t free_ctn) {