/* dict_cursor - iterators over dictionnaries */
-/* Copyright (c) 2004-2013. The SimGrid Team.
+/* Copyright (c) 2004-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/** @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;
* @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;
/*
* 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);
* @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");
/**
* \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;
*
* @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)
{
* @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);
* @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);
* @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)
{