From b339ccd8d934ce92d0511d25048b9d965a0d37b8 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 30 Nov 2012 17:31:16 +0100 Subject: [PATCH] Define inline functions in header file (again). --- src/simix/smx_global.c | 3 --- src/simix/smx_smurf_private.h | 20 ++++++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index 3cdbdc06ad..b82be914fe 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -24,9 +24,6 @@ static void SIMIX_action_mallocator_reset_f(void* action); static void SIMIX_clean(void); -SIMCALL_LIST(SIMCALL_RES_GETSET, SIMCALL_SEP_NOTHING) -SIMCALL_LIST(SIMCALL_ARG_GETSET, SIMCALL_SEP_NOTHING) - /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */ #include diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h index ff62452969..5384438499 100644 --- a/src/simix/smx_smurf_private.h +++ b/src/simix/smx_smurf_private.h @@ -200,30 +200,22 @@ /* generate the simcalls args getter/setter */ #define SIMCALL_ARG_GETSET_(i, name, v) \ - inline SIMCALL_FUNC_RETURN_TYPE(v) SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME(name), get, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall){\ + static inline SIMCALL_FUNC_RETURN_TYPE(v) SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME(name), get, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall){\ return simcall->args[i].SIMCALL_FIELD_ v ;\ }\ - inline void SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME(name), set, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall, SIMCALL_ARG_ v){\ + static inline void SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME(name), set, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall, SIMCALL_ARG_ v){\ simcall->args[i].SIMCALL_FIELD_ v = SIMCALL_NAME_ v ;\ } #define SIMCALL_ARG_GETSET(type, name, answer, res, ...)\ MAP_WITH_DEFAULT_ARGS(SIMCALL_ARG_GETSET_, (name), ##__VA_ARGS__) -/* generate the simcalls args getter/setter protos*/ -#define SIMCALL_ARG_GETSET_PROTO_(i, name, v) \ - inline SIMCALL_FUNC_RETURN_TYPE(v) SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME(name), get, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall);\ - inline void SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME(name), set, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall, SIMCALL_ARG_ v); - -#define SIMCALL_ARG_GETSET_PROTO(type, name, answer, res, ...)\ - MAP_WITH_DEFAULT_ARGS(SIMCALL_ARG_GETSET_PROTO_, (name), ##__VA_ARGS__) - /* generate the simcalls result getter/setter */ #define SIMCALL_WITH_RES_GETSET(name, v) \ - inline SIMCALL_FUNC_RETURN_TYPE(v) SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME((name)), get, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall){\ + static inline SIMCALL_FUNC_RETURN_TYPE(v) SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME((name)), get, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall){\ return simcall->result.SIMCALL_FIELD_ v ;\ }\ - inline void SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME((name)), set, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall, SIMCALL_ARG_ v){\ + static inline void SIMCALL_GS_FUNC(SIMCALL_GS_SC_NAME((name)), set, SIMCALL_GS_ARG_NAME(v))(smx_simcall_t simcall, SIMCALL_ARG_ v){\ simcall->result.SIMCALL_FIELD_ v = SIMCALL_NAME_ v ;\ } #define SIMCALL_WITHOUT_RES_GETSET(name, v) @@ -427,8 +419,8 @@ typedef struct s_smx_simcall { }; } s_smx_simcall_t, *smx_simcall_t; -SIMCALL_LIST(SIMCALL_RES_GETSET_PROTO, SIMCALL_SEP_NOTHING) -SIMCALL_LIST(SIMCALL_ARG_GETSET_PROTO, SIMCALL_SEP_NOTHING) +SIMCALL_LIST(SIMCALL_RES_GETSET, SIMCALL_SEP_NOTHING) +SIMCALL_LIST(SIMCALL_ARG_GETSET, SIMCALL_SEP_NOTHING) /******************************** General *************************************/ -- 2.20.1