savio pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=684617cfdc1c9dc535551b20063bcdaf50f624ce
commit 684617cfdc1c9dc535551b20063bcdaf50f624ce Author: Savio Sena <[email protected]> Date: Thu Sep 25 16:11:03 2014 -0300 eo-cxx: Get rid of eo_add_custom. --- src/bindings/eo_cxx/eo_inherit.hh | 2 +- src/bindings/eo_cxx/eo_ops.hh | 4 ---- src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh | 2 +- 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 bd78d3e..0d38539 100644 --- a/src/bindings/eo_cxx/eo_inherit.hh +++ b/src/bindings/eo_cxx/eo_inherit.hh @@ -77,7 +77,7 @@ struct inherit { typedef std::tuple<typename std::remove_reference<Args>::type...> tuple_type; _eo_cls = detail::create_class<D, tuple_type, E...> (eina::make_index_sequence<sizeof...(E)>()); - _eo_raw = eo_add_custom + _eo_raw = eo_add (_eo_cls, NULL, detail::inherit_constructor <tuple_type, E...> diff --git a/src/bindings/eo_cxx/eo_ops.hh b/src/bindings/eo_cxx/eo_ops.hh index 71aeb26..49d6e8d 100644 --- a/src/bindings/eo_cxx/eo_ops.hh +++ b/src/bindings/eo_cxx/eo_ops.hh @@ -7,10 +7,6 @@ extern "C" #include <Eo.h> } -#define eo_macro_add_custom(klass, parent, ...) ({ \ - eo_add_custom(klass, parent, __VA_ARGS__); \ - }) - namespace efl { namespace eo { namespace detail { inline 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 da03344..fad0bc1 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) << (*callback_iter).name << "));" << endl; } - out << tab(2) << "return eo_add_custom(" + out << tab(2) << "return eo_add(" << x._cls.eo_name << ", _p._eo_raw, " << (*it).name << "(" << parameters_list((*it).params) << "));" << endl << tab(1) << "}" << endl << endl; --
