summaryrefslogtreecommitdiff
path: root/src/benchmarks
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-09-06 13:57:55 +0100
committerTom Hacohen <tom@stosb.com>2016-09-06 13:58:13 +0100
commit75c981a9d9e639d5646024700c8df2c13677f445 (patch)
tree516078a7974f3e791085237600144a9ea6d1508a /src/benchmarks
parent689ba2ff6de807f8c416ce75a62070ae34b6e4e0 (diff)
Eo benchmarks: Fix according to recent Eo changes.
Thanks to Stefan for the report.
Diffstat (limited to 'src/benchmarks')
-rw-r--r--src/benchmarks/eo/class_simple.c16
-rw-r--r--src/benchmarks/eo/eo_bench_eo_do.c14
2 files changed, 21 insertions, 9 deletions
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index d37e3a1..75f8eb0 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -30,17 +30,23 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
30 30
31EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); 31EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
32 32
33static Efl_Op_Description op_desc[] = { 33static Eina_Bool
34 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 34_class_initializer(Efl_Class *klass)
35 EFL_OBJECT_OP_FUNC(simple_other_call, _other_call), 35{
36}; 36 EFL_OPS_DEFINE(ops,
37 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
38 EFL_OBJECT_OP_FUNC(simple_other_call, _other_call),
39 );
40
41 return efl_class_functions_set(klass, &ops);
42}
37 43
38static const Efl_Class_Description class_desc = { 44static const Efl_Class_Description class_desc = {
39 EO_VERSION, 45 EO_VERSION,
40 "Simple", 46 "Simple",
41 EFL_CLASS_TYPE_REGULAR, 47 EFL_CLASS_TYPE_REGULAR,
42 EFL_CLASS_DESCRIPTION_OPS(op_desc),
43 sizeof(Simple_Public_Data), 48 sizeof(Simple_Public_Data),
49 _class_initializer,
44 NULL, 50 NULL,
45 NULL 51 NULL
46}; 52};
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index 1f75119..0666580 100644
--- a/src/benchmarks/eo/eo_bench_eo_do.c
+++ b/src/benchmarks/eo/eo_bench_eo_do.c
@@ -58,9 +58,15 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
58 simple_a_set(efl_super(obj, cur_klass), a); 58 simple_a_set(efl_super(obj, cur_klass), a);
59} 59}
60 60
61static Efl_Op_Description op_desc[] = { 61static Eina_Bool
62 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 62_class_initializer(Efl_Class *klass)
63}; 63{
64 EFL_OPS_DEFINE(ops,
65 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
66 );
67
68 return efl_class_functions_set(klass, &ops);
69}
64 70
65static void 71static void
66bench_eo_do_super(int request) 72bench_eo_do_super(int request)
@@ -69,8 +75,8 @@ bench_eo_do_super(int request)
69 EO_VERSION, 75 EO_VERSION,
70 "Simple2", 76 "Simple2",
71 EFL_CLASS_TYPE_REGULAR, 77 EFL_CLASS_TYPE_REGULAR,
72 EFL_CLASS_DESCRIPTION_OPS(op_desc),
73 0, 78 0,
79 _class_initializer,
74 NULL, 80 NULL,
75 NULL 81 NULL
76 }; 82 };