summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-06-02 13:09:21 +0100
committerTom Hacohen <tom@stosb.com>2014-06-03 09:19:19 +0100
commit10626ff5388424c9be0aff04fbbc5a5b73cd210f (patch)
tree1854744db191d8484d2cd0aa76aa835b4a51daec /src/lib
parent7a83c9c659cb9c41601360d608e783e69ffef3a2 (diff)
Eo: Fix and use the abstract class .eo file.
Until now it was just there, but never generated or used.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/eo/Eo.h11
-rw-r--r--src/lib/eo/eo.c4
-rw-r--r--src/lib/eo/eo_abstract_class.eo1
-rw-r--r--src/lib/eo/eo_class_class.c12
4 files changed, 5 insertions, 23 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 5d92687..23150a6 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -913,16 +913,7 @@ EAPI Eina_Bool eo_composite_is(const Eo *comp_obj);
913 * @{ 913 * @{
914 */ 914 */
915 915
916/** 916#include "eo_abstract_class.eo.h"
917 * @def EO_CLASS_CLASS
918 * The class type for the Eo Class class.
919 */
920#define EO_CLASS_CLASS eo_class_class_get()
921/**
922 * @brief Use #EO_CLASS_CLASS
923 * @internal
924 * */
925EAPI const Eo_Class *eo_class_class_get(void);
926 917
927/** 918/**
928 * @} 919 * @}
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 9b8d6d7..8a14021 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -979,7 +979,7 @@ eo_class_get(const Eo *eo_id)
979 if (_eo_is_a_class(eo_id)) 979 if (_eo_is_a_class(eo_id))
980 { 980 {
981 EO_CLASS_POINTER_RETURN_VAL(eo_id, _klass, NULL); 981 EO_CLASS_POINTER_RETURN_VAL(eo_id, _klass, NULL);
982 return eo_class_class_get(); 982 return EO_ABSTRACT_CLASS_CLASS;
983 } 983 }
984 984
985 EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, NULL); 985 EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, NULL);
@@ -1802,7 +1802,7 @@ eo_init(void)
1802 EINA_LOG_STATE_INIT); 1802 EINA_LOG_STATE_INIT);
1803 1803
1804 /* bootstrap EO_CLASS_CLASS */ 1804 /* bootstrap EO_CLASS_CLASS */
1805 (void) eo_class_class_get(); 1805 (void) EO_ABSTRACT_CLASS_CLASS;
1806 1806
1807 if (_eo_call_stack_key != 0) 1807 if (_eo_call_stack_key != 0)
1808 WRN("_eo_call_stack_key already set, this should not happen."); 1808 WRN("_eo_call_stack_key already set, this should not happen.");
diff --git a/src/lib/eo/eo_abstract_class.eo b/src/lib/eo/eo_abstract_class.eo
index 82ab905..27a52e3 100644
--- a/src/lib/eo/eo_abstract_class.eo
+++ b/src/lib/eo/eo_abstract_class.eo
@@ -1,3 +1,4 @@
1abstract Eo_Abstract_Class () 1abstract Eo_Abstract_Class ()
2{ 2{
3 data: null;
3} 4}
diff --git a/src/lib/eo/eo_class_class.c b/src/lib/eo/eo_class_class.c
index 43c2ffe..d356755 100644
--- a/src/lib/eo/eo_class_class.c
+++ b/src/lib/eo/eo_class_class.c
@@ -4,15 +4,5 @@
4 4
5#include "Eo.h" 5#include "Eo.h"
6 6
7static const Eo_Class_Description class_desc = { 7#include "eo_abstract_class.eo.c"
8 EO_VERSION,
9 "Eo_Abstract_Class",
10 EO_CLASS_TYPE_REGULAR_NO_INSTANT,
11 EO_CLASS_DESCRIPTION_NOOPS(),
12 NULL,
13 0,
14 NULL,
15 NULL
16};
17 8
18EO_DEFINE_CLASS(eo_class_class_get, &class_desc, NULL, NULL)