summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio@expertisesolutions.com.br>2014-09-25 16:11:03 -0300
committerSavio Sena <savio@expertisesolutions.com.br>2014-09-25 16:11:03 -0300
commit684617cfdc1c9dc535551b20063bcdaf50f624ce (patch)
tree7f661d915dbbb08911150e8a71e7249ee721989c
parent13de9d089c4e2dc7fd243915c1d7f95b47f58968 (diff)
eo-cxx: Get rid of eo_add_custom.
-rw-r--r--src/bindings/eo_cxx/eo_inherit.hh2
-rw-r--r--src/bindings/eo_cxx/eo_ops.hh4
-rw-r--r--src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh2
3 files changed, 2 insertions, 6 deletions
diff --git a/src/bindings/eo_cxx/eo_inherit.hh b/src/bindings/eo_cxx/eo_inherit.hh
index bd78d3e4e3..0d38539d1f 100644
--- a/src/bindings/eo_cxx/eo_inherit.hh
+++ b/src/bindings/eo_cxx/eo_inherit.hh
@@ -77,7 +77,7 @@ struct inherit
77 { 77 {
78 typedef std::tuple<typename std::remove_reference<Args>::type...> tuple_type; 78 typedef std::tuple<typename std::remove_reference<Args>::type...> tuple_type;
79 _eo_cls = detail::create_class<D, tuple_type, E...> (eina::make_index_sequence<sizeof...(E)>()); 79 _eo_cls = detail::create_class<D, tuple_type, E...> (eina::make_index_sequence<sizeof...(E)>());
80 _eo_raw = eo_add_custom 80 _eo_raw = eo_add
81 (_eo_cls, NULL, 81 (_eo_cls, NULL,
82 detail::inherit_constructor 82 detail::inherit_constructor
83 <tuple_type, E...> 83 <tuple_type, E...>
diff --git a/src/bindings/eo_cxx/eo_ops.hh b/src/bindings/eo_cxx/eo_ops.hh
index 71aeb268c7..49d6e8d697 100644
--- a/src/bindings/eo_cxx/eo_ops.hh
+++ b/src/bindings/eo_cxx/eo_ops.hh
@@ -7,10 +7,6 @@ extern "C"
7#include <Eo.h> 7#include <Eo.h>
8} 8}
9 9
10#define eo_macro_add_custom(klass, parent, ...) ({ \
11 eo_add_custom(klass, parent, __VA_ARGS__); \
12 })
13
14namespace efl { namespace eo { namespace detail { 10namespace efl { namespace eo { namespace detail {
15 11
16inline void 12inline void
diff --git a/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh b/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
index da03344227..fad0bc194d 100644
--- a/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
+++ b/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
@@ -214,7 +214,7 @@ operator<<(std::ostream& out, eo_class_constructors const& x)
214 << (*callback_iter).name << "));" 214 << (*callback_iter).name << "));"
215 << endl; 215 << endl;
216 } 216 }
217 out << tab(2) << "return eo_add_custom(" 217 out << tab(2) << "return eo_add("
218 << x._cls.eo_name << ", _p._eo_raw, " << (*it).name 218 << x._cls.eo_name << ", _p._eo_raw, " << (*it).name
219 << "(" << parameters_list((*it).params) << "));" << endl 219 << "(" << parameters_list((*it).params) << "));" << endl
220 << tab(1) << "}" << endl << endl; 220 << tab(1) << "}" << endl << endl;