summaryrefslogtreecommitdiff
path: root/src/tests/eo/mixin/mixin_mixin2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests/eo/mixin/mixin_mixin2.c')
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index 7aff72b..93f30f6 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -18,14 +18,15 @@ _ab_sum_get(Eo *obj, void *class_data)
18 Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data; 18 Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data;
19 int sum = 0; 19 int sum = 0;
20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
21 eo_do_super(obj, MY_CLASS, sum = mixin_ab_sum_get()); 21 sum = mixin_ab_sum_get(eo_super(obj, MY_CLASS));
22 22
23 ++sum; 23 ++sum;
24 pd->count += 2; 24 pd->count += 2;
25 25
26 { 26 {
27 int _a = 0, _b = 0; 27 int _a = 0, _b = 0;
28 eo_do(obj, _a = simple_a_get(), _b = simple_b_get()); 28 _a = simple_a_get(obj);
29 _b = simple_b_get(obj);
29 fail_if(sum != _a + _b + 1); 30 fail_if(sum != _a + _b + 1);
30 } 31 }
31 32
@@ -35,14 +36,14 @@ _ab_sum_get(Eo *obj, void *class_data)
35static Eo * 36static Eo *
36_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 37_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
37{ 38{
38 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 39 obj = eo_constructor(eo_super(obj, MY_CLASS));
39 return obj; 40 return obj;
40} 41}
41 42
42static void 43static void
43_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 44_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
44{ 45{
45 eo_do_super(obj, MY_CLASS, eo_destructor()); 46 eo_destructor(eo_super(obj, MY_CLASS));
46} 47}
47 48
48static Eo_Op_Description op_descs[] = { 49static Eo_Op_Description op_descs[] = {