summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/benchmarks/eo/class_simple.c2
-rw-r--r--src/benchmarks/eo/eo_bench_eo_do.c2
-rw-r--r--src/bin/elementary/test_ui_grid.c6
-rw-r--r--src/lib/elementary/efl_ui_grid.c6
-rw-r--r--src/lib/eo/Eo.h27
-rw-r--r--src/lib/eo/eo.c36
-rw-r--r--src/tests/eo/access/access_inherit.c2
-rw-r--r--src/tests/eo/access/access_simple.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c2
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple.c4
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c6
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c2
-rw-r--r--src/tests/eo/interface/interface_interface.c2
-rw-r--r--src/tests/eo/interface/interface_interface2.c2
-rw-r--r--src/tests/eo/interface/interface_simple.c2
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c2
-rw-r--r--src/tests/eo/mixin/mixin_simple.c2
-rw-r--r--src/tests/eo/signals/signals_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c6
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c14
-rw-r--r--src/tests/eo/suite/eo_test_class_singleton.c2
-rw-r--r--src/tests/eo/suite/eo_test_domain.c2
-rw-r--r--src/tests/eo/suite/eo_test_general.c6
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c2
-rw-r--r--src/tests/eolian/data/class_simple_ref.c4
-rw-r--r--src/tests/eolian/data/override_ref.c4
38 files changed, 79 insertions, 94 deletions
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index 75f8eb0636..63378d6033 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -38,7 +38,7 @@ _class_initializer(Efl_Class *klass)
38 EFL_OBJECT_OP_FUNC(simple_other_call, _other_call), 38 EFL_OBJECT_OP_FUNC(simple_other_call, _other_call),
39 ); 39 );
40 40
41 return efl_class_functions_set(klass, &ops); 41 return efl_class_functions_set(klass, &ops, NULL);
42} 42}
43 43
44static const Efl_Class_Description class_desc = { 44static const Efl_Class_Description class_desc = {
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index d434ab9dad..ec69bf3145 100644
--- a/src/benchmarks/eo/eo_bench_eo_do.c
+++ b/src/benchmarks/eo/eo_bench_eo_do.c
@@ -65,7 +65,7 @@ _class_initializer(Efl_Class *klass)
65 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 65 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
66 ); 66 );
67 67
68 return efl_class_functions_set(klass, &ops); 68 return efl_class_functions_set(klass, &ops, NULL);
69} 69}
70 70
71static void 71static void
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 6902b01c48..ecc9720d31 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -22,11 +22,11 @@ static void _custom_engine_layout_do(Eo *obj, void *pd, Efl_Pack *pack, const vo
22static Eina_Bool 22static Eina_Bool
23_custom_engine_class_initializer(Efl_Class *klass) 23_custom_engine_class_initializer(Efl_Class *klass)
24{ 24{
25 EFL_OPS_DEFINE(ops, 25 EFL_OPS_DEFINE(class_ops,
26 EFL_OBJECT_OP_CLASS_FUNC(efl_pack_layout_do, _custom_engine_layout_do), 26 EFL_OBJECT_OP_FUNC(efl_pack_layout_do, _custom_engine_layout_do),
27 ); 27 );
28 28
29 return efl_class_functions_set(klass, &ops); 29 return efl_class_functions_set(klass, NULL, &class_ops);
30} 30}
31 31
32static const Efl_Class_Description custom_engine_class_desc = { 32static const Efl_Class_Description custom_engine_class_desc = {
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 3261c29423..4e0a843df2 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -168,11 +168,11 @@ static void _custom_table_calc(Eo *obj, Custom_Table_Data *pd);
168static Eina_Bool 168static Eina_Bool
169_custom_table_initializer(Efl_Class *klass) 169_custom_table_initializer(Efl_Class *klass)
170{ 170{
171 EFL_OPS_DEFINE(ops, 171 EFL_OPS_DEFINE(class_ops,
172 EFL_OBJECT_OP_CLASS_FUNC(efl_canvas_group_calculate, _custom_table_calc) 172 EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _custom_table_calc)
173 ); 173 );
174 174
175 return efl_class_functions_set(klass, &ops); 175 return efl_class_functions_set(klass, NULL, &class_ops);
176}; 176};
177 177
178static const Efl_Class_Description custom_table_class_desc = { 178static const Efl_Class_Description custom_table_class_desc = {
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index f1ce4c150d..a7325ac729 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -140,24 +140,6 @@ EAPI extern Eina_Lock _efl_class_creation_lock;
140EAPI extern unsigned int _efl_object_init_generation; 140EAPI extern unsigned int _efl_object_init_generation;
141 141
142/** 142/**
143 * @internal
144 * An enum representing the possible types of an Op.
145 */
146enum _Efl_Object_Op_Type
147{
148 EFL_OBJECT_OP_TYPE_INVALID = -1, /**< Invalid op. */
149 EFL_OBJECT_OP_TYPE_REGULAR = 0, /**< Regular op. */
150 EFL_OBJECT_OP_TYPE_CLASS, /**< Class op - a class op. Like static in Java/C++. */
151};
152
153/**
154 * @internal
155 * @typedef Efl_Object_Op_Type
156 * A convenience typedef for #_Efl_Object_Op_Type.
157 */
158typedef enum _Efl_Object_Op_Type Efl_Object_Op_Type;
159
160/**
161 * @typedef Efl_Del_Intercept 143 * @typedef Efl_Del_Intercept
162 * 144 *
163 * A function to be called on object deletion/destruction instead of normal 145 * A function to be called on object deletion/destruction instead of normal
@@ -374,7 +356,6 @@ typedef struct _Efl_Op_Description
374{ 356{
375 void *api_func; /**< The EAPI function offering this op. (The name of the func on windows) */ 357 void *api_func; /**< The EAPI function offering this op. (The name of the func on windows) */
376 void *func; /**< The static function to call for the op. */ 358 void *func; /**< The static function to call for the op. */
377 Efl_Object_Op_Type op_type; /**< The type of the Op. */
378} Efl_Op_Description; 359} Efl_Op_Description;
379 360
380/** 361/**
@@ -427,14 +408,15 @@ EAPI const Efl_Class *efl_class_new(const Efl_Class_Description *desc, const Efl
427/** 408/**
428 * @brief Set the functions of a class 409 * @brief Set the functions of a class
429 * @param klass_id the class whose functions we are setting. 410 * @param klass_id the class whose functions we are setting.
430 * @param ops The function structure we are setting. 411 * @param object_ops The function structure we are setting for object functions
412 * @param class_ops The function structure we are setting for class functions
431 * @return True on success, False otherwise. 413 * @return True on success, False otherwise.
432 * 414 *
433 * This should only be called from within the initializer function. 415 * This should only be called from within the initializer function.
434 * 416 *
435 * @see #EFL_DEFINE_CLASS 417 * @see #EFL_DEFINE_CLASS
436 */ 418 */
437EAPI Eina_Bool efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *ops); 419EAPI Eina_Bool efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops);
438 420
439/** 421/**
440 * @brief Override Eo functions of this object. 422 * @brief Override Eo functions of this object.
@@ -850,8 +832,7 @@ typedef struct _Efl_Object_Call_Cache
850# define _EFL_OBJECT_OP_API_ENTRY(a) #a 832# define _EFL_OBJECT_OP_API_ENTRY(a) #a
851#endif 833#endif
852 834
853#define EFL_OBJECT_OP_FUNC(_api, _private) { _EFL_OBJECT_OP_API_ENTRY(_api), (void*)_private, EFL_OBJECT_OP_TYPE_REGULAR } 835#define EFL_OBJECT_OP_FUNC(_api, _private) { _EFL_OBJECT_OP_API_ENTRY(_api), (void*)_private }
854#define EFL_OBJECT_OP_CLASS_FUNC(_api, _private) { _EFL_OBJECT_OP_API_ENTRY(_api), (void*)_private, EFL_OBJECT_OP_TYPE_CLASS }
855 836
856// returns the OP id corresponding to the given api_func 837// returns the OP id corresponding to the given api_func
857EAPI Efl_Object_Op _efl_object_api_op_id_get(const void *api_func); 838EAPI Efl_Object_Op _efl_object_api_op_id_get(const void *api_func);
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 08d2bb6df0..9b098351fb 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -608,15 +608,15 @@ _efl_object_api_op_id_get(const void *api_func)
608/* klass is the klass we are working on. hierarchy_klass is the class whe should 608/* klass is the klass we are working on. hierarchy_klass is the class whe should
609 * use when validating. */ 609 * use when validating. */
610static Eina_Bool 610static Eina_Bool
611_eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Class *hierarchy_klass, const _Efl_Class *klass, Eina_Bool override_only EINA_UNUSED) 611_eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Class *hierarchy_klass, const _Efl_Class *klass, Efl_Object_Op id_offset, Eina_Bool override_only)
612{ 612{
613 unsigned int i; 613 unsigned int i;
614 int op_id; 614 Efl_Object_Op op_id;
615 const void *last_api_func; 615 const void *last_api_func;
616 const Efl_Op_Description *op_desc; 616 const Efl_Op_Description *op_desc;
617 const Efl_Op_Description *op_descs; 617 const Efl_Op_Description *op_descs;
618 618
619 op_id = hierarchy_klass->base_id; 619 op_id = hierarchy_klass->base_id + id_offset;
620 op_descs = ops->descs; 620 op_descs = ops->descs;
621 621
622 DBG("Set functions for class '%s':%p", klass->desc->name, klass); 622 DBG("Set functions for class '%s':%p", klass->desc->name, klass);
@@ -635,7 +635,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Cla
635 return EINA_FALSE; 635 return EINA_FALSE;
636 } 636 }
637 637
638 if ((op_desc->op_type == EFL_OBJECT_OP_TYPE_REGULAR) || (op_desc->op_type == EFL_OBJECT_OP_TYPE_CLASS)) 638 /* Get the opid for the function. */
639 { 639 {
640 if (_eo_api_func_equal(op_desc->api_func, last_api_func)) 640 if (_eo_api_func_equal(op_desc->api_func, last_api_func))
641 { 641 {
@@ -667,13 +667,6 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Cla
667 } 667 }
668 } 668 }
669 669
670 if (op == EFL_NOOP)
671 {
672 ERR("Class '%s': Invalid op 'EFL_NOOP' (%p->%p '%s').",
673 klass->desc->name, op_desc->api_func, op_desc->func, _eo_op_desc_name_get(op_desc));
674 return EINA_FALSE;
675 }
676
677 DBG("%p->%p '%s'", op_desc->api_func, op_desc->func, _eo_op_desc_name_get(op_desc)); 670 DBG("%p->%p '%s'", op_desc->api_func, op_desc->func, _eo_op_desc_name_get(op_desc));
678 671
679 if (!_vtable_func_set(vtable, klass, op, op_desc->func)) 672 if (!_vtable_func_set(vtable, klass, op, op_desc->func))
@@ -686,10 +679,11 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Cla
686} 679}
687 680
688EAPI Eina_Bool 681EAPI Eina_Bool
689efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *ops) 682efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops)
690{ 683{
691 EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, EINA_FALSE); 684 EO_CLASS_POINTER_RETURN_VAL(klass_id, klass, EINA_FALSE);
692 Efl_Object_Ops empty_ops = { 0 }; 685 Efl_Object_Ops empty_ops = { 0 };
686
693 if (klass->functions_set) 687 if (klass->functions_set)
694 { 688 {
695 ERR("Class %s already had its functions set..", klass->desc->name); 689 ERR("Class %s already had its functions set..", klass->desc->name);
@@ -697,12 +691,17 @@ efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *ops)
697 } 691 }
698 klass->functions_set = EINA_TRUE; 692 klass->functions_set = EINA_TRUE;
699 693
700 if (!ops) 694 if (!object_ops)
695 {
696 object_ops = &empty_ops;
697 }
698
699 if (!class_ops)
701 { 700 {
702 ops = &empty_ops; 701 class_ops = &empty_ops;
703 } 702 }
704 703
705 klass->ops_count = ops->count; 704 klass->ops_count = object_ops->count + class_ops->count;
706 705
707 klass->base_id = _eo_ops_last_id; 706 klass->base_id = _eo_ops_last_id;
708 _eo_ops_last_id += klass->ops_count + 1; 707 _eo_ops_last_id += klass->ops_count + 1;
@@ -723,7 +722,8 @@ efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *ops)
723 } 722 }
724 } 723 }
725 724
726 return _eo_class_funcs_set(&klass->vtable, ops, klass, klass, EINA_FALSE); 725 return _eo_class_funcs_set(&klass->vtable, object_ops, klass, klass, 0, EINA_FALSE) &&
726 _eo_class_funcs_set(&klass->vtable, class_ops, klass, klass, object_ops->count, EINA_FALSE);
727} 727}
728 728
729EAPI Eo * 729EAPI Eo *
@@ -1374,7 +1374,7 @@ efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...
1374 /* If functions haven't been set, invoke it with an empty ops structure. */ 1374 /* If functions haven't been set, invoke it with an empty ops structure. */
1375 if (!klass->functions_set) 1375 if (!klass->functions_set)
1376 { 1376 {
1377 efl_class_functions_set(_eo_class_id_get(klass), NULL); 1377 efl_class_functions_set(_eo_class_id_get(klass), NULL, NULL);
1378 } 1378 }
1379 1379
1380 /* Mark which classes we implement */ 1380 /* Mark which classes we implement */
@@ -1437,7 +1437,7 @@ efl_object_override(Eo *eo_id, const Efl_Object_Ops *ops)
1437 return EINA_FALSE; 1437 return EINA_FALSE;
1438 } 1438 }
1439 1439
1440 if (!_eo_class_funcs_set(obj->vtable, ops, obj->klass, klass, EINA_TRUE)) 1440 if (!_eo_class_funcs_set(obj->vtable, ops, obj->klass, klass, 0, EINA_TRUE))
1441 { 1441 {
1442 ERR("Failed to override functions for %p", eo_id); 1442 ERR("Failed to override functions for %p", eo_id);
1443 return EINA_FALSE; 1443 return EINA_FALSE;
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index 71929012ce..2f830bde8a 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -25,7 +25,7 @@ _class_initializer(Efl_Class *klass)
25 EFL_OBJECT_OP_FUNC(inherit_prot_print, _prot_print), 25 EFL_OBJECT_OP_FUNC(inherit_prot_print, _prot_print),
26 ); 26 );
27 27
28 return efl_class_functions_set(klass, &ops); 28 return efl_class_functions_set(klass, &ops, NULL);
29} 29}
30 30
31static const Efl_Class_Description class_desc = { 31static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index f29683447f..5b75d0c52b 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -39,7 +39,7 @@ _class_initializer(Efl_Class *klass)
39 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 39 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
40 ); 40 );
41 41
42 return efl_class_functions_set(klass, &ops); 42 return efl_class_functions_set(klass, &ops, NULL);
43} 43}
44 44
45static const Efl_Class_Description class_desc = { 45static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index f96ee35224..b0b271ded1 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -44,7 +44,7 @@ _class_initializer(Efl_Class *klass)
44 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 44 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
45 ); 45 );
46 46
47 return efl_class_functions_set(klass, &ops); 47 return efl_class_functions_set(klass, &ops, NULL);
48} 48}
49 49
50static const Efl_Class_Description class_desc = { 50static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index a377af3608..b9bc70fb78 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -172,7 +172,7 @@ _class_initializer(Efl_Class *klass)
172 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 172 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
173 ); 173 );
174 174
175 return efl_class_functions_set(klass, &ops); 175 return efl_class_functions_set(klass, &ops, NULL);
176} 176}
177 177
178static const Efl_Class_Description class_desc = { 178static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 7911602b38..c3cbdc50b1 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -46,7 +46,7 @@ _class_initializer(Efl_Class *klass)
46 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor), 46 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
47 ); 47 );
48 48
49 return efl_class_functions_set(klass, &ops); 49 return efl_class_functions_set(klass, &ops, NULL);
50} 50}
51 51
52static const Efl_Class_Description class_desc = { 52static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index ca6de0c2b2..cdce5d1e33 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -95,10 +95,10 @@ _class_initializer(Efl_Class *klass)
95 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 95 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
96 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 96 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
97 EFL_OBJECT_OP_FUNC(simple_b_set, _b_set), 97 EFL_OBJECT_OP_FUNC(simple_b_set, _b_set),
98 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get), 98 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
99 ); 99 );
100 100
101 return efl_class_functions_set(klass, &ops); 101 return efl_class_functions_set(klass, &ops, NULL);
102} 102}
103 103
104static const Efl_Class_Description class_desc = { 104static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index 2cd3e89c3b..71f8ae1335 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -23,7 +23,7 @@ _class_initializer(Efl_Class *klass)
23 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor), 23 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
24 ); 24 );
25 25
26 return efl_class_functions_set(klass, &ops); 26 return efl_class_functions_set(klass, &ops, NULL);
27} 27}
28 28
29static const Efl_Class_Description class_desc = { 29static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index f66dada0e8..7bab6dafc4 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
21 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor), 21 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
22 ); 22 );
23 23
24 return efl_class_functions_set(klass, &ops); 24 return efl_class_functions_set(klass, &ops, NULL);
25} 25}
26 26
27static const Efl_Class_Description class_desc = { 27static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index 21a35495d5..73bc8fe89c 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor), 21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
22 ); 22 );
23 23
24 return efl_class_functions_set(klass, &ops); 24 return efl_class_functions_set(klass, &ops, NULL);
25} 25}
26 26
27static const Efl_Class_Description class_desc = { 27static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index 0bd814426e..021f1f988c 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor), 21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
22 ); 22 );
23 23
24 return efl_class_functions_set(klass, &ops); 24 return efl_class_functions_set(klass, &ops, NULL);
25} 25}
26 26
27static const Efl_Class_Description class_desc = { 27static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index 54ddd147b9..22c653729c 100644
--- a/src/tests/eo/constructors/constructors_simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -25,7 +25,7 @@ _class_initializer(Efl_Class *klass)
25 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor), 25 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
26 ); 26 );
27 27
28 return efl_class_functions_set(klass, &ops); 28 return efl_class_functions_set(klass, &ops, NULL);
29} 29}
30 30
31static const Efl_Class_Description class_desc = { 31static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 52105be17b..71732fe931 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -65,11 +65,13 @@ _class_initializer(Efl_Class *klass)
65 EFL_OPS_DEFINE(ops, 65 EFL_OPS_DEFINE(ops,
66 EFL_OBJECT_OP_FUNC(inherit2_print, _print), 66 EFL_OBJECT_OP_FUNC(inherit2_print, _print),
67 EFL_OBJECT_OP_FUNC(inherit2_print2, _print2), 67 EFL_OBJECT_OP_FUNC(inherit2_print2, _print2),
68 EFL_OBJECT_OP_CLASS_FUNC(simple_class_print, _class_print),
69 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 68 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
70 ); 69 );
70 EFL_OPS_DEFINE(cops,
71 EFL_OBJECT_OP_FUNC(simple_class_print, _class_print),
72 );
71 73
72 return efl_class_functions_set(klass, &ops); 74 return efl_class_functions_set(klass, &ops, &cops);
73} 75}
74 76
75static const Efl_Class_Description class_desc = { 77static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 7e7cd756ee..e3f34076d2 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -23,7 +23,7 @@ _class_initializer(Efl_Class *klass)
23 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 23 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
24 ); 24 );
25 25
26 return efl_class_functions_set(klass, &ops); 26 return efl_class_functions_set(klass, &ops, NULL);
27} 27}
28 28
29static const Efl_Class_Description class_desc = { 29static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 9477e7d41a..fbd5681367 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -66,7 +66,7 @@ _class_initializer(Efl_Class *klass)
66 EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2), 66 EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2),
67 ); 67 );
68 68
69 return efl_class_functions_set(klass, &ops); 69 return efl_class_functions_set(klass, &ops, NULL);
70} 70}
71 71
72static const Efl_Class_Description class_desc = { 72static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c
index deac3af2a4..dd5b293906 100644
--- a/src/tests/eo/interface/interface_interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -17,7 +17,7 @@ _class_initializer(Efl_Class *klass)
17 EFL_OBJECT_OP_FUNC(interface_ab_sum_get, NULL), 17 EFL_OBJECT_OP_FUNC(interface_ab_sum_get, NULL),
18 ); 18 );
19 19
20 return efl_class_functions_set(klass, &ops); 20 return efl_class_functions_set(klass, &ops, NULL);
21} 21}
22 22
23static const Efl_Class_Description class_desc = { 23static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c
index 6cbc0b8337..4b18105bba 100644
--- a/src/tests/eo/interface/interface_interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -18,7 +18,7 @@ _class_initializer(Efl_Class *klass)
18 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, NULL), 18 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, NULL),
19 ); 19 );
20 20
21 return efl_class_functions_set(klass, &ops); 21 return efl_class_functions_set(klass, &ops, NULL);
22} 22}
23 23
24static const Efl_Class_Description class_desc = { 24static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index 0b5806c9e9..0d20eea5fc 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -68,7 +68,7 @@ _class_initializer(Efl_Class *klass)
68 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, _ab_sum_get2), 68 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, _ab_sum_get2),
69 ); 69 );
70 70
71 return efl_class_functions_set(klass, &ops); 71 return efl_class_functions_set(klass, &ops, NULL);
72} 72}
73 73
74static const Efl_Class_Description class_desc = { 74static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index 0600823bee..964fbe2527 100644
--- a/src/tests/eo/mixin/mixin_inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -26,7 +26,7 @@ _class_initializer(Efl_Class *klass)
26 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 26 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
27 ); 27 );
28 28
29 return efl_class_functions_set(klass, &ops); 29 return efl_class_functions_set(klass, &ops, NULL);
30} 30}
31 31
32static const Efl_Class_Description class_desc = { 32static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 4ef198a108..06bff56d2b 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -41,7 +41,7 @@ _class_initializer(Efl_Class *klass)
41 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 41 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
42 ); 42 );
43 43
44 return efl_class_functions_set(klass, &ops); 44 return efl_class_functions_set(klass, &ops, NULL);
45} 45}
46 46
47static const Efl_Class_Description class_desc = { 47static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index e29f7e88ee..48ea26a1d6 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -55,7 +55,7 @@ _class_initializer(Efl_Class *klass)
55 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 55 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
56 ); 56 );
57 57
58 return efl_class_functions_set(klass, &ops); 58 return efl_class_functions_set(klass, &ops, NULL);
59} 59}
60 60
61static const Efl_Class_Description class_desc = { 61static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index 32828734c0..8036249b89 100644
--- a/src/tests/eo/mixin/mixin_mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -54,7 +54,7 @@ _class_initializer(Efl_Class *klass)
54 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 54 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
55 ); 55 );
56 56
57 return efl_class_functions_set(klass, &ops); 57 return efl_class_functions_set(klass, &ops, NULL);
58} 58}
59 59
60static const Efl_Class_Description class_desc = { 60static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index 8322d31235..9bc843514c 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -47,7 +47,7 @@ _class_initializer(Efl_Class *klass)
47 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get), 47 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
48 ); 48 );
49 49
50 return efl_class_functions_set(klass, &ops); 50 return efl_class_functions_set(klass, &ops, NULL);
51} 51}
52 52
53static const Efl_Class_Description class_desc = { 53static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 403c1093be..9449c3f8c0 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -79,7 +79,7 @@ _class_initializer(Efl_Class *klass)
79 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 79 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
80 ); 80 );
81 81
82 return efl_class_functions_set(klass, &ops); 82 return efl_class_functions_set(klass, &ops, NULL);
83} 83}
84 84
85static const Efl_Class_Description class_desc = { 85static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index 49fef3bcd4..43d72d4301 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -29,7 +29,7 @@ _destructor_unref_class_initializer(Efl_Class *klass2)
29 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor_unref), 29 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor_unref),
30 ); 30 );
31 31
32 return efl_class_functions_set(klass2, &ops); 32 return efl_class_functions_set(klass2, &ops, NULL);
33} 33}
34 34
35START_TEST(efl_destructor_unref) 35START_TEST(efl_destructor_unref)
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index 0e475b52d4..ef15c99707 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -209,7 +209,7 @@ _null_class_initializer(Efl_Class *klass)
209 EFL_OBJECT_OP_FUNC(NULL, _null_fct), 209 EFL_OBJECT_OP_FUNC(NULL, _null_fct),
210 ); 210 );
211 211
212 return efl_class_functions_set(klass, &ops); 212 return efl_class_functions_set(klass, &ops, NULL);
213} 213}
214 214
215START_TEST(eo_null_api) 215START_TEST(eo_null_api)
@@ -248,7 +248,7 @@ _redefined_class_initializer(Efl_Class *klass)
248 EFL_OBJECT_OP_FUNC(null_fct, NULL), 248 EFL_OBJECT_OP_FUNC(null_fct, NULL),
249 ); 249 );
250 250
251 return efl_class_functions_set(klass, &ops); 251 return efl_class_functions_set(klass, &ops, NULL);
252} 252}
253 253
254START_TEST(eo_api_redefined) 254START_TEST(eo_api_redefined)
@@ -287,7 +287,7 @@ _dich_func_class_initializer(Efl_Class *klass)
287 EFL_OBJECT_OP_FUNC(simple_a_set, NULL), 287 EFL_OBJECT_OP_FUNC(simple_a_set, NULL),
288 ); 288 );
289 289
290 return efl_class_functions_set(klass, &ops); 290 return efl_class_functions_set(klass, &ops, NULL);
291} 291}
292 292
293START_TEST(eo_dich_func_override) 293START_TEST(eo_dich_func_override)
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index a740e433f2..56620c68a2 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -95,14 +95,16 @@ _class_initializer(Efl_Class *klass)
95 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 95 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
96 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 96 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
97 EFL_OBJECT_OP_FUNC(simple_a_print, _a_print), 97 EFL_OBJECT_OP_FUNC(simple_a_print, _a_print),
98 EFL_OBJECT_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print),
99 EFL_OBJECT_OP_FUNC(simple_recursive, _recursive), 98 EFL_OBJECT_OP_FUNC(simple_recursive, _recursive),
100 EFL_OBJECT_OP_FUNC(simple_part_get, _part_get), 99 EFL_OBJECT_OP_FUNC(simple_part_get, _part_get),
101 EFL_OBJECT_OP_FUNC(simple_pure_virtual, NULL), 100 EFL_OBJECT_OP_FUNC(simple_pure_virtual, NULL),
102 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _dbg_info_get), 101 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _dbg_info_get),
103 ); 102 );
103 EFL_OPS_DEFINE(cops,
104 EFL_OBJECT_OP_FUNC(simple_class_hi_print, _class_hi_print),
105 );
104 106
105 return efl_class_functions_set(klass, &ops); 107 return efl_class_functions_set(klass, &ops, &cops);
106} 108}
107 109
108static const Efl_Class_Description class_desc = { 110static const Efl_Class_Description class_desc = {
@@ -129,11 +131,11 @@ EFL_FUNC_BODY_CONST(simple2_class_beef_get, int, 0);
129static Eina_Bool 131static Eina_Bool
130_class_initializer2(Efl_Class *klass) 132_class_initializer2(Efl_Class *klass)
131{ 133{
132 EFL_OPS_DEFINE(ops, 134 EFL_OPS_DEFINE(cops,
133 EFL_OBJECT_OP_CLASS_FUNC(simple2_class_beef_get, _beef_get), 135 EFL_OBJECT_OP_FUNC(simple2_class_beef_get, _beef_get),
134 ); 136 );
135 137
136 return efl_class_functions_set(klass, &ops); 138 return efl_class_functions_set(klass, NULL, &cops);
137} 139}
138 140
139static const Efl_Class_Description class_desc2 = { 141static const Efl_Class_Description class_desc2 = {
@@ -163,7 +165,7 @@ _searchable_class_initializer(Efl_Class *klass)
163 EFL_OBJECT_OP_FUNC(efl_provider_find, _interface_get) 165 EFL_OBJECT_OP_FUNC(efl_provider_find, _interface_get)
164 ); 166 );
165 167
166 return efl_class_functions_set(klass, &ops); 168 return efl_class_functions_set(klass, &ops, NULL);
167} 169}
168 170
169static const Efl_Class_Description class_desc_searchable = { 171static const Efl_Class_Description class_desc_searchable = {
diff --git a/src/tests/eo/suite/eo_test_class_singleton.c b/src/tests/eo/suite/eo_test_class_singleton.c
index 4bed42e2cc..e5db1ff62c 100644
--- a/src/tests/eo/suite/eo_test_class_singleton.c
+++ b/src/tests/eo/suite/eo_test_class_singleton.c
@@ -32,7 +32,7 @@ _class_initializer(Efl_Class *klass)
32 EFL_OBJECT_OP_FUNC(efl_constructor, _singleton_efl_constructor), 32 EFL_OBJECT_OP_FUNC(efl_constructor, _singleton_efl_constructor),
33 ); 33 );
34 34
35 return efl_class_functions_set(klass, &ops); 35 return efl_class_functions_set(klass, &ops, NULL);
36} 36}
37 37
38static const Efl_Class_Description class_desc = { 38static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_domain.c b/src/tests/eo/suite/eo_test_domain.c
index 6f88e597f1..45a1fe377f 100644
--- a/src/tests/eo/suite/eo_test_domain.c
+++ b/src/tests/eo/suite/eo_test_domain.c
@@ -65,7 +65,7 @@ _class_initializer(Efl_Class *klass)
65 EFL_OBJECT_OP_FUNC(domain_a_get, _a_get), 65 EFL_OBJECT_OP_FUNC(domain_a_get, _a_get),
66 EFL_OBJECT_OP_FUNC(domain_recursive, _recursive) 66 EFL_OBJECT_OP_FUNC(domain_recursive, _recursive)
67 ); 67 );
68 return efl_class_functions_set(klass, &ops); 68 return efl_class_functions_set(klass, &ops, NULL);
69} 69}
70 70
71static const Efl_Class_Description class_desc = { 71static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 1676faf344..73418337d0 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -436,7 +436,7 @@ _class_initializer(Efl_Class *klass)
436 EFL_OBJECT_OP_FUNC(efl_destructor, _man_des), 436 EFL_OBJECT_OP_FUNC(efl_destructor, _man_des),
437 ); 437 );
438 438
439 return efl_class_functions_set(klass, &ops); 439 return efl_class_functions_set(klass, &ops, NULL);
440} 440}
441 441
442START_TEST(eo_man_free) 442START_TEST(eo_man_free)
@@ -990,7 +990,7 @@ _multi_class_initializer(Efl_Class *klass)
990 EFL_OBJECT_OP_FUNC(multi_class_hi_print, _class_hi_print), 990 EFL_OBJECT_OP_FUNC(multi_class_hi_print, _class_hi_print),
991 ); 991 );
992 992
993 return efl_class_functions_set(klass, &ops); 993 return efl_class_functions_set(klass, &ops, NULL);
994} 994}
995 995
996START_TEST(eo_multiple_do) 996START_TEST(eo_multiple_do)
@@ -1169,7 +1169,7 @@ _add_failures_class_initializer(Efl_Class *klass)
1169 EFL_OBJECT_OP_FUNC(efl_finalize, _efl_add_failures_finalize), 1169 EFL_OBJECT_OP_FUNC(efl_finalize, _efl_add_failures_finalize),
1170 ); 1170 );
1171 1171
1172 return efl_class_functions_set(klass, &ops); 1172 return efl_class_functions_set(klass, &ops, NULL);
1173} 1173}
1174 1174
1175START_TEST(efl_add_failures) 1175START_TEST(efl_add_failures)
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index e707fc04e1..aea925ea62 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -69,7 +69,7 @@ _class_initializer(Efl_Class *klass)
69 EFL_OBJECT_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack), 69 EFL_OBJECT_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack),
70 ); 70 );
71 71
72 return efl_class_functions_set(klass, &ops); 72 return efl_class_functions_set(klass, &ops, NULL);
73} 73}
74 74
75static const Efl_Class_Description class_desc = { 75static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c
index cd075e16a4..290aaa01d5 100644
--- a/src/tests/eolian/data/class_simple_ref.c
+++ b/src/tests/eolian/data/class_simple_ref.c
@@ -34,7 +34,7 @@ _class_simple_class_initializer(Efl_Class *klass)
34 EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_foo, __eolian_class_simple_foo) 34 EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_foo, __eolian_class_simple_foo)
35 ); 35 );
36 36
37 return efl_class_functions_set(klass, &ops); 37 return efl_class_functions_set(klass, &ops, NULL);
38} 38}
39 39
40static const Efl_Class_Description _class_simple_class_desc = { 40static const Efl_Class_Description _class_simple_class_desc = {
@@ -47,4 +47,4 @@ static const Efl_Class_Description _class_simple_class_desc = {
47 NULL 47 NULL
48}; 48};
49 49
50EFL_DEFINE_CLASS(class_simple_class_get, &_class_simple_class_desc, NULL, NULL); \ No newline at end of file 50EFL_DEFINE_CLASS(class_simple_class_get, &_class_simple_class_desc, NULL, NULL);
diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c
index f54b9dc729..31994cd9f0 100644
--- a/src/tests/eolian/data/override_ref.c
+++ b/src/tests/eolian/data/override_ref.c
@@ -70,7 +70,7 @@ _override_class_initializer(Efl_Class *klass)
70 EFL_OBJECT_OP_FUNC(override_foo, NULL) 70 EFL_OBJECT_OP_FUNC(override_foo, NULL)
71 ); 71 );
72 72
73 return efl_class_functions_set(klass, &ops); 73 return efl_class_functions_set(klass, &ops, NULL);
74} 74}
75 75
76static const Efl_Class_Description _override_class_desc = { 76static const Efl_Class_Description _override_class_desc = {
@@ -83,4 +83,4 @@ static const Efl_Class_Description _override_class_desc = {
83 NULL 83 NULL
84}; 84};
85 85
86EFL_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL); \ No newline at end of file 86EFL_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL);