diff options
| author | Tom Hacohen <tom@stosb.com> | 2013-07-31 17:16:59 +0100 |
|---|---|---|
| committer | Tom Hacohen <tom@stosb.com> | 2013-07-31 17:16:59 +0100 |
| commit | 1ea966c3bef7384a91e386477dc07015ed18d33f (patch) | |
| tree | 168ae9ec38e4b2ba2233820d2d70a57d078802e3 | |
| parent | 99f0afee4b27ea117f7630209c93916cd339f605 (diff) | |
| download | efl-1ea966c3bef7384a91e386477dc07015ed18d33f.tar.gz | |
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 8c8780cfa4..e3d0e86b57 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -628,9 +628,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; \ @@ -658,25 +659,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) |