Remove bogus inline declarations in public interface.

diff --git a/include/msg/msg.h b/include/msg/msg.h
index 4a5c6e9..07dcf2c 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -168,9 +168,10 @@ XBT_PUBLIC(MSG_error_t)
 #define MSG_task_recv(t,a) MSG_task_receive(t,a)
 
 XBT_PUBLIC(msg_comm_t) MSG_task_isend(m_task_t task, const char *alias);
 #define MSG_task_recv(t,a) MSG_task_receive(t,a)
 
 XBT_PUBLIC(msg_comm_t) MSG_task_isend(m_task_t task, const char *alias);

-XBT_INLINE XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(m_task_t task, const char *alias,
-                                                               int (*match_fun)(void*,void*),
-                                                               void *match_data);
+XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(m_task_t task,
+                                                    const char *alias,
+                                                    int (*match_fun)(void*,void*),
+                                                    void *match_data);

 
 XBT_PUBLIC(void) MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup);
 XBT_PUBLIC(msg_comm_t) MSG_task_irecv(m_task_t * task, const char *alias);
 
 XBT_PUBLIC(void) MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup);
 XBT_PUBLIC(msg_comm_t) MSG_task_irecv(m_task_t * task, const char *alias);

diff --git a/include/simix/context.h b/include/simix/context.h
index 137e374..1b6eccb 100644 (file)
--- a/include/simix/context.h
+++ b/include/simix/context.h
@@ -99,13 +99,13 @@ XBT_PUBLIC(xbt_dynar_t) SIMIX_process_get_runnable(void);
 XBT_PUBLIC(smx_process_t) SIMIX_process_from_PID(int PID);
 
 /* parallelism */
 XBT_PUBLIC(smx_process_t) SIMIX_process_from_PID(int PID);
 
 /* parallelism */

-XBT_INLINE int SIMIX_context_is_parallel(void);
-XBT_INLINE int SIMIX_context_get_nthreads(void);
-XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads);
-XBT_INLINE int SIMIX_context_get_parallel_threshold(void);
-XBT_INLINE void SIMIX_context_set_parallel_threshold(int threshold);
-XBT_INLINE e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode(void);
-XBT_INLINE void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode);
+XBT_PUBLIC(int) SIMIX_context_is_parallel(void);
+XBT_PUBLIC(int) SIMIX_context_get_nthreads(void);
+XBT_PUBLIC(void) SIMIX_context_set_nthreads(int nb_threads);
+XBT_PUBLIC(int) SIMIX_context_get_parallel_threshold(void);
+XBT_PUBLIC(void) SIMIX_context_set_parallel_threshold(int threshold);
+XBT_PUBLIC(e_xbt_parmap_mode_t) SIMIX_context_get_parallel_mode(void);
+XBT_PUBLIC(void) SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode);

 
 SG_END_DECL()
 
 
 SG_END_DECL()
 

diff --git a/include/simix/simix.h b/include/simix/simix.h
index cc84f0c..12fb3b7 100644 (file)
--- a/include/simix/simix.h
+++ b/include/simix/simix.h
@@ -28,7 +28,7 @@ XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_pfn_smxprocess_t func
 
 /* Simulation execution */
 XBT_PUBLIC(void) SIMIX_run(void);    
 
 /* Simulation execution */
 XBT_PUBLIC(void) SIMIX_run(void);    

-XBT_INLINE XBT_PUBLIC(double) SIMIX_get_clock(void);
+XBT_PUBLIC(double) SIMIX_get_clock(void);

 
 /* Timer functions FIXME: should these be public? */
 XBT_PUBLIC(void) SIMIX_timer_set(double date, void *function, void *arg);
 
 /* Timer functions FIXME: should these be public? */
 XBT_PUBLIC(void) SIMIX_timer_set(double date, void *function, void *arg);


@@ -62,7 +62,7 @@ XBT_PUBLIC(void*) SIMIX_host_self_get_data(void);
 
 /********************************* Process ************************************/
 XBT_PUBLIC(int) SIMIX_process_count(void);
 
 /********************************* Process ************************************/
 XBT_PUBLIC(int) SIMIX_process_count(void);

-XBT_INLINE XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
+XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);

 XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void);
 XBT_PUBLIC(void) SIMIX_process_self_set_data(smx_process_t self, void *data);
 XBT_PUBLIC(void*) SIMIX_process_self_get_data(smx_process_t self);
 XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void);
 XBT_PUBLIC(void) SIMIX_process_self_set_data(smx_process_t self, void *data);
 XBT_PUBLIC(void*) SIMIX_process_self_get_data(smx_process_t self);


@@ -91,7 +91,7 @@ XBT_PUBLIC(void) SIMIX_comm_finish(smx_action_t action);
 /******************************* Host simcalls ********************************/
 /* TODO use handlers and keep smx_host_t hidden from higher levels */
 XBT_PUBLIC(xbt_dict_t) simcall_host_get_dict(void);
 /******************************* Host simcalls ********************************/
 /* TODO use handlers and keep smx_host_t hidden from higher levels */
 XBT_PUBLIC(xbt_dict_t) simcall_host_get_dict(void);

-XBT_INLINE XBT_PUBLIC(smx_host_t) simcall_host_get_by_name(const char *name);
+XBT_PUBLIC(smx_host_t) simcall_host_get_by_name(const char *name);

 XBT_PUBLIC(const char *) simcall_host_get_name(smx_host_t host);
 XBT_PUBLIC(xbt_dict_t) simcall_host_get_properties(smx_host_t host);
 XBT_PUBLIC(double) simcall_host_get_speed(smx_host_t host);
 XBT_PUBLIC(const char *) simcall_host_get_name(smx_host_t host);
 XBT_PUBLIC(xbt_dict_t) simcall_host_get_properties(smx_host_t host);
 XBT_PUBLIC(double) simcall_host_get_speed(smx_host_t host);


@@ -144,7 +144,7 @@ XBT_PUBLIC(void) simcall_process_resume(smx_process_t process);
 XBT_PUBLIC(int) simcall_process_count(void);
 XBT_PUBLIC(void *) simcall_process_get_data(smx_process_t process);
 XBT_PUBLIC(void) simcall_process_set_data(smx_process_t process, void *data);
 XBT_PUBLIC(int) simcall_process_count(void);
 XBT_PUBLIC(void *) simcall_process_get_data(smx_process_t process);
 XBT_PUBLIC(void) simcall_process_set_data(smx_process_t process, void *data);

-XBT_INLINE XBT_PUBLIC(smx_host_t) simcall_process_get_host(smx_process_t process);
+XBT_PUBLIC(smx_host_t) simcall_process_get_host(smx_process_t process);

 XBT_PUBLIC(const char *) simcall_process_get_name(smx_process_t process);
 XBT_PUBLIC(int) simcall_process_is_suspended(smx_process_t process);
 XBT_PUBLIC(xbt_dict_t) simcall_process_get_properties(smx_process_t host);
 XBT_PUBLIC(const char *) simcall_process_get_name(smx_process_t process);
 XBT_PUBLIC(int) simcall_process_is_suspended(smx_process_t process);
 XBT_PUBLIC(xbt_dict_t) simcall_process_get_properties(smx_process_t host);


@@ -190,7 +190,7 @@ XBT_PUBLIC(smx_action_t) simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff,
 
 XBT_PUBLIC(void) simcall_comm_destroy(smx_action_t comm);
 
 
 XBT_PUBLIC(void) simcall_comm_destroy(smx_action_t comm);
 

-XBT_INLINE XBT_PUBLIC(void) simcall_comm_cancel(smx_action_t comm);
+XBT_PUBLIC(void) simcall_comm_cancel(smx_action_t comm);

 
 /* FIXME: waitany is going to be a vararg function, and should take a timeout */
 XBT_PUBLIC(unsigned int) simcall_comm_waitany(xbt_dynar_t comms);
 
 /* FIXME: waitany is going to be a vararg function, and should take a timeout */
 XBT_PUBLIC(unsigned int) simcall_comm_waitany(xbt_dynar_t comms);

diff --git a/include/xbt/socket.h b/include/xbt/socket.h
index 177ad51..3d568a7 100644 (file)
--- a/include/xbt/socket.h
+++ b/include/xbt/socket.h
@@ -35,15 +35,14 @@
 typedef struct s_xbt_socket *xbt_socket_t;
 typedef struct s_xbt_trp_plugin s_xbt_trp_plugin_t, *xbt_trp_plugin_t;
 
 typedef struct s_xbt_socket *xbt_socket_t;
 typedef struct s_xbt_trp_plugin s_xbt_trp_plugin_t, *xbt_trp_plugin_t;
 

-void xbt_socket_new(int incoming,
-                    xbt_socket_t* dst);
-void xbt_socket_new_ext(int incoming,
-                        xbt_socket_t* dst,
-                        xbt_trp_plugin_t plugin,
-                        unsigned long int buf_size,
-                        int measurement);
-XBT_INLINE void* xbt_socket_get_data(xbt_socket_t sock);
-XBT_INLINE void xbt_socket_set_data(xbt_socket_t sock, void* data);
+XBT_PUBLIC(void) xbt_socket_new(int incoming, xbt_socket_t* dst);
+XBT_PUBLIC(void) xbt_socket_new_ext(int incoming,
+                                    xbt_socket_t* dst,
+                                    xbt_trp_plugin_t plugin,
+                                    unsigned long int buf_size,
+                                    int measurement);
+XBT_PUBLIC(void*) xbt_socket_get_data(xbt_socket_t sock);
+XBT_PUBLIC(void) xbt_socket_set_data(xbt_socket_t sock, void* data);

 
 /** \brief Simply create a client socket (to speak to a remote host) */
 XBT_PUBLIC(xbt_socket_t) xbt_socket_tcp_client(const char *host,
 
 /** \brief Simply create a client socket (to speak to a remote host) */
 XBT_PUBLIC(xbt_socket_t) xbt_socket_tcp_client(const char *host,