diff options
| author | Tom Hacohen <tom@stosb.com> | 2013-07-31 17:16:59 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2013-07-31 17:16:59 +0100 |
| commit | cfffd77f80c0451adef20d880bee0f129b30f02a (patch) | |
| tree | 2ea2854742e6a02571e06d018a151feb944f4e61 | |
| parent | 018f5aa8f80a5989053d039eb0ade943f1c2b34f (diff) | |
| download | efl-cfffd77f80c0451adef20d880bee0f129b30f02a.tar.gz | |
eo2: Fixed EO2_CLASS_FUNC_BODY and etc. functions.
| -rw-r--r-- | src/lib/eo/Eo.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 354c4b3853..12b87c4dab 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -642,9 +642,10 @@ typedef struct _Eo2_Op_Call_Data __##Name##_func _func_ = (__##Name##_func) call.func; \ return Func; \ -#define _EO2_CLASS_FUNC_COMMON(Name, Ret, Func, DefRet, Class) \ +#define _EO2_CLASS_FUNC_COMMON(Name, Ret, Func, DefRet) \ static Eo_Op op = EO_NOOP; \ - if ( op == EO_NOOP ) op = eo2_api_op_id_get((void*)Name, Class); \ + if ( op == EO_NOOP ) \ + op = eo2_api_op_id_get((void*)Name, call.klass_id); \ Eo2_Op_Call_Data call; \ if (!eo2_call_resolve(op, &call)) return DefRet; \ __##Name##_func _func_ = (__##Name##_func) call.func; \ @@ -672,25 +673,25 @@ typedef struct _Eo2_Op_Call_Data #define EO2_VOID_FUNC_BODYV(Name, Func, ...) EO2_FUNC_BODYV(Name, void, Func, , __VA_ARGS__) // to define a EAPI class function -#define EO2_CLASS_FUNC_BODY(Name, Ret, DefRet, Class) \ +#define EO2_CLASS_FUNC_BODY(Name, Ret, DefRet) \ Ret \ Name(void) \ { \ typedef Ret (*__##Name##_func)(Eo_Class *); \ - _EO2_CLASS_FUNC_COMMON(Name, Ret, _func_(call.klass_id), DefRet, Class) \ + _EO2_CLASS_FUNC_COMMON(Name, Ret, _func_(call.klass_id), DefRet) \ } -#define EO2_VOID_CLASS_FUNC_BODY(Name, Class) EO2_CLASS_FUNC_BODY(Name, void, , Class) +#define EO2_VOID_CLASS_FUNC_BODY(Name) EO2_CLASS_FUNC_BODY(Name, void, ) -#define EO2_CLASS_FUNC_BODYV(Name, Ret, Func, DefRet, Class, ...) \ +#define EO2_CLASS_FUNC_BODYV(Name, Ret, Func, DefRet, ...) \ Ret \ Name(__VA_ARGS__) \ { \ typedef Ret (*__##Name##_func)(Eo_Class *, __VA_ARGS__); \ - _EO2_CLASS_FUNC_COMMON(Name, Ret, Func, DefRet, Class) \ + _EO2_CLASS_FUNC_COMMON(Name, Ret, Func, DefRet) \ } -#define EO2_VOID_CLASS_FUNC_BODYV(Name, Func, Class, ...) EO2_CLASS_FUNC_BODYV(Name, void, Func, , Class, __VA_ARGS__) +#define EO2_VOID_CLASS_FUNC_BODYV(Name, Func, ...) EO2_CLASS_FUNC_BODYV(Name, void, Func, , __VA_ARGS__) // OP ID of an overriding function #define EO2_OP_OVERRIDE ((Eo_Op) -1) |