More explicit inline marking of functions

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6890 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h
index 02fe739..a4af07b 100644 (file)
--- a/include/xbt/dynar.h
+++ b/include/xbt/dynar.h
@@ -66,11 +66,11 @@ 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_PUBLIC(void) xbt_dynar_free(xbt_dynar_t * dynar);
+XBT_INLINE 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(unsigned long) xbt_dynar_length(const xbt_dynar_t dynar);
+XBT_INLINE XBT_PUBLIC(unsigned long) xbt_dynar_length(const xbt_dynar_t dynar);
 XBT_PUBLIC(void) xbt_dynar_reset(xbt_dynar_t const dynar);
 XBT_PUBLIC(void) xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots);
 
@@ -105,8 +105,8 @@ XBT_PUBLIC(int) xbt_dynar_member(xbt_dynar_t const dynar, void *elem);
  *  @{
  */
 
-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_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_unshift(xbt_dynar_t const dynar, const void *src);
 XBT_PUBLIC(void) xbt_dynar_shift(xbt_dynar_t const dynar, void *const dst);
 XBT_PUBLIC(void) xbt_dynar_map(const xbt_dynar_t dynar,
@@ -121,7 +121,7 @@ XBT_PUBLIC(void) xbt_dynar_map(const xbt_dynar_t dynar,
  *  @{
  */
 
-XBT_PUBLIC(void *) xbt_dynar_get_ptr(const xbt_dynar_t dynar,
+XBT_INLINE 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);
@@ -182,7 +182,7 @@ XBT_PUBLIC(void *) xbt_dynar_pop_ptr(xbt_dynar_t const dynar);
  *  @{
  */
 
-XBT_PUBLIC(void) xbt_dynar_cursor_rm(xbt_dynar_t dynar,
+XBT_INLINE 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);
 

diff --git a/include/xbt/strbuff.h b/include/xbt/strbuff.h
index 1230c03..7f945e8 100644 (file)
--- 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_PUBLIC(xbt_strbuff_t) xbt_strbuff_new_from(char *s);
+XBT_INLINE XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new_from(char *s);
 XBT_PUBLIC(void) xbt_strbuff_free(xbt_strbuff_t b);
-XBT_PUBLIC(void) xbt_strbuff_free_container(xbt_strbuff_t b);
+XBT_INLINE 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/src/include/simix/simix.h b/src/include/simix/simix.h
index e316262..00da72f 100644 (file)
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -79,7 +79,7 @@ XBT_PUBLIC(smx_host_t *) SIMIX_host_get_table(void);
 XBT_PUBLIC(xbt_dict_t) SIMIX_host_get_dict(void);
 
 XBT_PUBLIC(void) SIMIX_create_environment(const char *file);
-XBT_PUBLIC(smx_host_t) SIMIX_host_get_by_name(const char *name);
+XBT_INLINE XBT_PUBLIC(smx_host_t) SIMIX_host_get_by_name(const char *name);
 
 XBT_PUBLIC(xbt_dict_t) SIMIX_host_get_properties(smx_host_t host);
 
@@ -104,7 +104,7 @@ XBT_PUBLIC(void) SIMIX_process_change_host(smx_process_t process,
 XBT_PUBLIC(void *) SIMIX_process_get_data(smx_process_t process);
 XBT_PUBLIC(void) SIMIX_process_set_data(smx_process_t process, void *data);
 
-XBT_PUBLIC(smx_host_t) SIMIX_process_get_host(smx_process_t process);
+XBT_INLINE XBT_PUBLIC(smx_host_t) SIMIX_process_get_host(smx_process_t process);
 XBT_PUBLIC(const char *) SIMIX_process_get_name(smx_process_t process);
 XBT_INLINE XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
 
@@ -172,7 +172,7 @@ XBT_PUBLIC(void) SIMIX_register_action_to_condition(smx_action_t action,
 XBT_PUBLIC(void) SIMIX_unregister_action_to_condition(smx_action_t action,
                                                       smx_cond_t cond);
 XBT_PUBLIC(void) SIMIX_register_action_to_semaphore(smx_action_t action, smx_sem_t sem);
-XBT_PUBLIC(void) SIMIX_unregister_action_to_semaphore(smx_action_t action, smx_sem_t sem);
+XBT_INLINE XBT_PUBLIC(void) SIMIX_unregister_action_to_semaphore(smx_action_t action, smx_sem_t sem);
 
 
 XBT_PUBLIC(double) SIMIX_action_get_remains(smx_action_t action);

diff --git a/src/surf/surf_action.c b/src/surf/surf_action.c
index 4e4707f..d77ca45 100644 (file)
--- a/src/surf/surf_action.c
+++ b/src/surf/surf_action.c
@@ -58,12 +58,12 @@ e_surf_action_state_t surf_action_state_get(surf_action_t action)
   return SURF_ACTION_NOT_IN_THE_SYSTEM;
 }
 
-XBT_INLINE double surf_action_get_start_time(surf_action_t action)
+double surf_action_get_start_time(surf_action_t action)
 {
   return action->start;
 }
 
-XBT_INLINE double surf_action_get_finish_time(surf_action_t action)
+double surf_action_get_finish_time(surf_action_t action)
 {
   /* keep the function behavior, some models (cpu_ti) change the finish time before the action end */
   return action->remains == 0 ? action->finish : -1;
@@ -98,7 +98,7 @@ void surf_action_state_set(surf_action_t action, e_surf_action_state_t state)
   XBT_OUT;
 }
 
-XBT_INLINE void surf_action_data_set(surf_action_t action, void *data)
+void surf_action_data_set(surf_action_t action, void *data)
 {
   action->data = data;
 }