From 69128883beb4dfd713ece4ca484f37aab0461101 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 12 Nov 2010 14:16:06 +0100 Subject: [PATCH] Fix compilation warnings in ISO-C99 mode. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix the following compilation warnings (indeed wrong inline usage): - inline function ‘xxx’ declared but never defined Tested with gcc 4.3 and 4.4. See the following messages for more information: http://lists.gforge.inria.fr/pipermail/simgrid-devel/2010-July/000958.html http://lists.gforge.inria.fr/pipermail/simgrid-devel/2010-July/000971.html http://lists.gforge.inria.fr/pipermail/simgrid-devel/2010-July/000978.html http://lists.gforge.inria.fr/pipermail/simgrid-devel/2010-August/000998.html See also bug #11428. --- include/msg/msg.h | 2 +- include/xbt/dict.h | 5 ++--- include/xbt/dynar.h | 35 +++++++++++++++-------------------- include/xbt/fifo.h | 10 ++++------ include/xbt/strbuff.h | 4 ++-- include/xbt/swag.h | 2 +- 6 files changed, 25 insertions(+), 33 deletions(-) diff --git a/include/msg/msg.h b/include/msg/msg.h index 70a37322b5..c35cbed858 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -31,7 +31,7 @@ XBT_PUBLIC(void) MSG_set_function(const char *host_id, const char *function_name, xbt_dynar_t arguments); -XBT_INLINE XBT_PUBLIC(double) MSG_get_clock(void); +XBT_PUBLIC(double) MSG_get_clock(void); XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(void); diff --git a/include/xbt/dict.h b/include/xbt/dict.h index 8a26fc58f0..f5256cf214 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -124,8 +124,7 @@ typedef struct 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_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); @@ -136,7 +135,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_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 diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h index 67418d11d9..9e2a65d2d3 100644 --- a/include/xbt/dynar.h +++ b/include/xbt/dynar.h @@ -66,7 +66,7 @@ XBT_PUBLIC(xbt_dynar_t) xbt_dynar_new(const unsigned long elm_size, void_f_pvoid_t const free_f); XBT_PUBLIC(xbt_dynar_t) xbt_dynar_new_sync(const unsigned long elm_size, void_f_pvoid_t const free_f); -XBT_INLINE XBT_PUBLIC(void) xbt_dynar_free(xbt_dynar_t * dynar); +XBT_PUBLIC(void) xbt_dynar_free(xbt_dynar_t * dynar); XBT_PUBLIC(void) xbt_dynar_free_voidp(void *dynar); XBT_PUBLIC(void) xbt_dynar_free_container(xbt_dynar_t * dynar); XBT_PUBLIC(void) xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots); @@ -93,14 +93,13 @@ XBT_PUBLIC(void) xbt_dynar_insert_at(xbt_dynar_t const dynar, XBT_PUBLIC(void) xbt_dynar_remove_at(xbt_dynar_t const dynar, const int idx, void *const dst); -XBT_PUBLIC(unsigned int) xbt_dynar_search(xbt_dynar_t const dynar, - void *elem); +XBT_PUBLIC(unsigned int) xbt_dynar_search(xbt_dynar_t const dynar, void *elem); XBT_PUBLIC(int) xbt_dynar_member(xbt_dynar_t const dynar, void *elem); XBT_PUBLIC(void) xbt_dynar_sort(xbt_dynar_t const dynar, int_f_cpvoid_cpvoid_t compar_fn); -XBT_INLINE XBT_PUBLIC(int) xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, - int(*compar)(const void *, const void *)); -XBT_INLINE XBT_PUBLIC(void *) xbt_dynar_to_array (xbt_dynar_t dynar); +XBT_PUBLIC(int) xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, + int(*compar)(const void *, const void *)); +XBT_PUBLIC(void *) xbt_dynar_to_array (xbt_dynar_t dynar); /** @} */ /** @defgroup XBT_dynar_misc Dynar miscellaneous functions @@ -109,9 +108,8 @@ XBT_INLINE XBT_PUBLIC(void *) xbt_dynar_to_array (xbt_dynar_t dynar); * @{ */ -XBT_INLINE XBT_PUBLIC(unsigned long) xbt_dynar_length(const xbt_dynar_t - dynar); -XBT_INLINE XBT_PUBLIC(int) xbt_dynar_is_empty(const xbt_dynar_t dynar); +XBT_PUBLIC(unsigned long) xbt_dynar_length(const xbt_dynar_t dynar); +XBT_PUBLIC(int) xbt_dynar_is_empty(const xbt_dynar_t dynar); XBT_PUBLIC(void) xbt_dynar_reset(xbt_dynar_t const dynar); @@ -122,10 +120,8 @@ XBT_PUBLIC(void) xbt_dynar_reset(xbt_dynar_t const dynar); * @{ */ -XBT_INLINE XBT_PUBLIC(void) xbt_dynar_push(xbt_dynar_t const dynar, - const void *src); -XBT_INLINE XBT_PUBLIC(void) xbt_dynar_pop(xbt_dynar_t const dynar, - void *const dst); +XBT_PUBLIC(void) xbt_dynar_push(xbt_dynar_t const dynar, const void *src); +XBT_PUBLIC(void) xbt_dynar_pop(xbt_dynar_t const dynar, void *const dst); XBT_PUBLIC(void) xbt_dynar_unshift(xbt_dynar_t const dynar, const void *src); XBT_PUBLIC(void) xbt_dynar_shift(xbt_dynar_t const dynar, void *const dst); @@ -141,10 +137,10 @@ XBT_PUBLIC(void) xbt_dynar_map(const xbt_dynar_t dynar, * @{ */ -XBT_INLINE XBT_PUBLIC(void *) xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, - const unsigned long idx); -XBT_INLINE XBT_PUBLIC(void *) xbt_dynar_get_ptr(const xbt_dynar_t dynar, - const unsigned long idx); +XBT_PUBLIC(void *) xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, + const unsigned long idx); +XBT_PUBLIC(void *) xbt_dynar_get_ptr(const xbt_dynar_t dynar, + const unsigned long idx); XBT_PUBLIC(void *) xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar, const int idx); XBT_PUBLIC(void *) xbt_dynar_push_ptr(xbt_dynar_t const dynar); @@ -208,9 +204,8 @@ XBT_PUBLIC(void *) xbt_dynar_pop_ptr(xbt_dynar_t const dynar); * @{ */ -XBT_INLINE XBT_PUBLIC(void) xbt_dynar_cursor_rm(xbt_dynar_t dynar, - unsigned int *const - cursor); +XBT_PUBLIC(void) xbt_dynar_cursor_rm(xbt_dynar_t dynar, + unsigned int *const cursor); XBT_PUBLIC(void) xbt_dynar_cursor_unlock(xbt_dynar_t dynar); /* do not use this structure internals directly, but use the public interface diff --git a/include/xbt/fifo.h b/include/xbt/fifo.h index 5455d697d9..ee3832c5ab 100644 --- a/include/xbt/fifo.h +++ b/include/xbt/fifo.h @@ -53,10 +53,10 @@ XBT_PUBLIC(int) xbt_fifo_is_in(xbt_fifo_t, void *); * @{ */ -XBT_INLINE XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_new_item(void); +XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_new_item(void); XBT_PUBLIC(void) xbt_fifo_set_item_content(xbt_fifo_item_t, void *); XBT_PUBLIC(void *) xbt_fifo_get_item_content(xbt_fifo_item_t); -XBT_INLINE XBT_PUBLIC(void) xbt_fifo_free_item(xbt_fifo_item_t); +XBT_PUBLIC(void) xbt_fifo_free_item(xbt_fifo_item_t); XBT_PUBLIC(void) xbt_fifo_push_item(xbt_fifo_t, xbt_fifo_item_t); XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_pop_item(xbt_fifo_t); @@ -67,10 +67,8 @@ XBT_PUBLIC(int) xbt_fifo_remove(xbt_fifo_t, void *); XBT_PUBLIC(int) xbt_fifo_remove_all(xbt_fifo_t, void *); XBT_PUBLIC(void) xbt_fifo_remove_item(xbt_fifo_t, xbt_fifo_item_t); -XBT_INLINE XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_first_item(xbt_fifo_t - l); -XBT_INLINE XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_last_item(xbt_fifo_t - l); +XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_first_item(xbt_fifo_t l); +XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_last_item(xbt_fifo_t l); XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_next_item(xbt_fifo_item_t i); XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_prev_item(xbt_fifo_item_t i); diff --git a/include/xbt/strbuff.h b/include/xbt/strbuff.h index 021de28377..1666655730 100644 --- a/include/xbt/strbuff.h +++ b/include/xbt/strbuff.h @@ -28,9 +28,9 @@ typedef struct { XBT_PUBLIC(void) xbt_strbuff_empty(xbt_strbuff_t b); XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new(void); -XBT_INLINE XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new_from(char *s); +XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new_from(char *s); XBT_PUBLIC(void) xbt_strbuff_free(xbt_strbuff_t b); -XBT_INLINE XBT_PUBLIC(void) xbt_strbuff_free_container(xbt_strbuff_t b); +XBT_PUBLIC(void) xbt_strbuff_free_container(xbt_strbuff_t b); XBT_PUBLIC(void) xbt_strbuff_append(xbt_strbuff_t b, const char *toadd); XBT_PUBLIC(void) xbt_strbuff_chomp(xbt_strbuff_t b); XBT_PUBLIC(void) xbt_strbuff_trim(xbt_strbuff_t b); diff --git a/include/xbt/swag.h b/include/xbt/swag.h index 1407b52bb4..9ebd506420 100644 --- a/include/xbt/swag.h +++ b/include/xbt/swag.h @@ -88,7 +88,7 @@ typedef struct xbt_swag { XBT_PUBLIC(xbt_swag_t) xbt_swag_new(size_t offset); XBT_PUBLIC(void) xbt_swag_free(xbt_swag_t swag); -XBT_INLINE XBT_PUBLIC(void) xbt_swag_init(xbt_swag_t swag, size_t offset); +XBT_PUBLIC(void) xbt_swag_init(xbt_swag_t swag, size_t offset); /** * \param obj the objet to insert in the swag -- 2.20.1