summaryrefslogtreecommitdiff
path: root/src/bindings
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-03-02 11:32:16 -0300
committerVitor Sousa <vitorsousasilva@gmail.com>2016-03-03 16:05:40 -0300
commit5c7d78d1040b5bdfe6430e84c90d36ab8bf27064 (patch)
tree92df4e670157028a85de897f1fbbc0ffeffb63a7 /src/bindings
parent0c545b88ba69e7f66e927b1f7318cdb156b07d79 (diff)
eolian-cxx: Partial fix for generation without eo_do
Diffstat (limited to 'src/bindings')
-rw-r--r--src/bindings/eo_cxx/eo_event.hh2
-rw-r--r--src/bindings/eo_cxx/eo_inherit_bindings.hh4
-rw-r--r--src/bindings/eo_cxx/eo_ops.hh56
3 files changed, 32 insertions, 30 deletions
diff --git a/src/bindings/eo_cxx/eo_event.hh b/src/bindings/eo_cxx/eo_event.hh
index d0b335e0e5..5fa6404256 100644
--- a/src/bindings/eo_cxx/eo_event.hh
+++ b/src/bindings/eo_cxx/eo_event.hh
@@ -95,7 +95,7 @@ struct _event_deleter
95 95
96 void operator()() const 96 void operator()() const
97 { 97 {
98 eo_do(_eo, ::eo_event_callback_del(_description, _cb, _data)); 98 ::eo_event_callback_del(_eo, _description, _cb, _data);
99 ::ecore_main_loop_thread_safe_call_async(&_deleter_call, _data); 99 ::ecore_main_loop_thread_safe_call_async(&_deleter_call, _data);
100 } 100 }
101 101
diff --git a/src/bindings/eo_cxx/eo_inherit_bindings.hh b/src/bindings/eo_cxx/eo_inherit_bindings.hh
index cbd2bc8d98..458036d099 100644
--- a/src/bindings/eo_cxx/eo_inherit_bindings.hh
+++ b/src/bindings/eo_cxx/eo_inherit_bindings.hh
@@ -61,7 +61,9 @@ void inherit_constructor_impl(Eo*, Inherit_Private_Data* self, void* this_)
61/// @param this_ The <em>user data</em> to be passed to the resolved function. 61/// @param this_ The <em>user data</em> to be passed to the resolved function.
62/// @param args An heterogeneous sequence of arguments. 62/// @param args An heterogeneous sequence of arguments.
63/// 63///
64inline EOAPI EO_VOID_FUNC_BODYV(inherit_constructor, EO_FUNC_CALL(this_), void* this_); 64// inline EOAPI EO_VOID_FUNC_BODYV(inherit_constructor, EO_FUNC_CALL(this_), void* this_);
65inline
66void inherit_constructor(void* this_);
65 67
66template <typename T> 68template <typename T>
67int initialize_operation_description(detail::tag<void>, void*); 69int initialize_operation_description(detail::tag<void>, void*);
diff --git a/src/bindings/eo_cxx/eo_ops.hh b/src/bindings/eo_cxx/eo_ops.hh
index 47d920d31c..46a33c77dc 100644
--- a/src/bindings/eo_cxx/eo_ops.hh
+++ b/src/bindings/eo_cxx/eo_ops.hh
@@ -22,112 +22,112 @@ shutdown()
22} 22}
23 23
24inline Eo* 24inline Eo*
25ref(const Eo *obj) 25ref(Eo *obj)
26{ 26{
27 return ::eo_ref(obj); 27 return ::eo_ref(obj);
28} 28}
29 29
30inline void 30inline void
31unref(const Eo *obj) 31unref(Eo *obj)
32{ 32{
33 ::eo_unref(obj); 33 ::eo_unref(obj);
34} 34}
35 35
36inline int 36inline int
37ref_get(const Eo *obj) 37ref_get(Eo *obj)
38{ 38{
39 return ::eo_ref_get(obj); 39 return ::eo_ref_get(obj);
40} 40}
41 41
42inline void 42inline void
43del(const Eo *obj) 43del(Eo *obj)
44{ 44{
45 ::eo_del(obj); 45 ::eo_del(obj);
46} 46}
47 47
48inline Eina_Bool 48inline Eina_Bool
49isa(const Eo *obj, const Eo_Class *klass) 49isa(Eo *obj, Eo_Class *klass)
50{ 50{
51 return eo_isa(obj, klass); 51 return eo_isa(obj, klass);
52} 52}
53 53
54inline Eo* 54inline Eo*
55add(const Eo_Class *klass, Eo *parent = NULL) 55add(Eo_Class *klass, Eo *parent = NULL)
56{ 56{
57 Eo *eo = eo_add_ref(klass, parent); 57 Eo *eo = eo_add_ref(klass, parent);
58 return eo; 58 return eo;
59} 59}
60 60
61inline void 61inline void
62dbg_info_get(const Eo *obj, Eo_Dbg_Info *info) 62dbg_info_get(Eo *obj, Eo_Dbg_Info *info)
63{ 63{
64 eo_do(obj, eo_dbg_info_get(info)); 64 eo_dbg_info_get(obj, info);
65} 65}
66 66
67inline void 67inline void
68base_data_set(const Eo *obj, const char *key, const void *data) 68base_data_set(Eo *obj, const char *key, const void *data)
69{ 69{
70 eo_do(obj, eo_key_data_set(key, data)); 70 eo_key_data_set(obj, key, data);
71} 71}
72 72
73inline void* 73inline void*
74base_data_get(const Eo *obj, const char *key) 74base_data_get(Eo *obj, const char *key)
75{ 75{
76 void *data; 76 void *data;
77 eo_do(obj, data = eo_key_data_get(key)); 77 data = eo_key_data_get(obj, key);
78 return data; 78 return data;
79} 79}
80 80
81inline void 81inline void
82base_data_del(const Eo *obj, const char *key) 82base_data_del(Eo *obj, const char *key)
83{ 83{
84 eo_do(obj, eo_key_data_del(key)); 84 eo_key_data_del(obj, key);
85} 85}
86 86
87inline void 87inline void
88parent_set(const Eo *obj, Eo *parent) 88parent_set(Eo *obj, Eo *parent)
89{ 89{
90 eo_do(obj, eo_parent_set(parent)); 90 eo_parent_set(obj, parent);
91} 91}
92 92
93inline Eo* 93inline Eo*
94parent_get(const Eo *obj) 94parent_get(Eo *obj)
95{ 95{
96 Eo *parent; 96 Eo *parent;
97 eo_do(obj, parent = eo_parent_get()); 97 parent = eo_parent_get(obj);
98 return parent; 98 return parent;
99} 99}
100 100
101inline void 101inline void
102event_freeze(const Eo *obj) 102event_freeze(Eo *obj)
103{ 103{
104 eo_do(obj, eo_event_freeze()); 104 eo_event_freeze(obj);
105} 105}
106 106
107inline void 107inline void
108event_thaw(const Eo *obj) 108event_thaw(Eo *obj)
109{ 109{
110 eo_do(obj, eo_event_thaw()); 110 eo_event_thaw(obj);
111} 111}
112 112
113inline int 113inline int
114event_freeze_get(const Eo *obj) 114event_freeze_get(Eo *obj)
115{ 115{
116 int count = -1; 116 int count = -1;
117 eo_do(obj, count = eo_event_freeze_count_get()); 117 count = eo_event_freeze_count_get(obj);
118 return count; 118 return count;
119} 119}
120 120
121inline void 121inline void
122wref_add(const Eo *obj, Eo **wref) 122wref_add(Eo *obj, Eo **wref)
123{ 123{
124 eo_do(obj, eo_wref_add(wref)); 124 eo_wref_add(obj, wref);
125} 125}
126 126
127inline void 127inline void
128wref_del(const Eo *obj, Eo **wref) 128wref_del(Eo *obj, Eo **wref)
129{ 129{
130 eo_do(obj, eo_wref_del(wref)); 130 eo_wref_del(obj, wref);
131} 131}
132 132
133} } } 133} } }