kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cxx: follow eoid to eo_self rename in cxx generator and bindings 

Bringing efl back to a building state with cxx enabled.
This commit is contained in:
Stefan Schmidt 2016-03-16 21:11:17 +01:00
parent 7cbd8c7b93
commit e981bfc4e8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bindings/eo_cxx/eo_cxx_interop.hh
View File

@ -472,11 +472,11 @@ F* alloc_static_callback(F&& f)
template <typename... Fs> template <typename... Fs>
inline inline
void call_ctors(Eo* _obj_eoid, Fs&&... fs) void call_ctors(Eo* _obj_eo_self, Fs&&... fs)
{ {
std::initializer_list<int const> const v {(fs(_obj_eoid), 0)...}; std::initializer_list<int const> const v {(fs(_obj_eo_self), 0)...};
(void) v; (void) v;
(void) _obj_eoid; (void) _obj_eo_self;
} }
} } // namespace efl { namespace eolian { } } // namespace efl { namespace eolian {

2
src/bindings/eo_cxx/eo_inherit.hh
View File

@ -85,7 +85,7 @@ struct inherit
inherit(efl::eo::parent_type _p, Args&& ... args) inherit(efl::eo::parent_type _p, Args&& ... args)
{ {
_eo_cls = detail::create_class<D, E...> (eina::make_index_sequence<sizeof...(E)>()); _eo_cls = detail::create_class<D, E...> (eina::make_index_sequence<sizeof...(E)>());
_eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, detail::inherit_constructor(eoid, this), ::efl::eolian::call_ctors(eoid, args...)); _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, detail::inherit_constructor(eo_self, this), ::efl::eolian::call_ctors(eo_self, args...));
::efl::eolian::register_ev_del_free_callback(_eo_raw, args...); ::efl::eolian::register_ev_del_free_callback(_eo_raw, args...);
} }

8
src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
View File

@ -158,9 +158,9 @@ operator<<(std::ostream& out, functors_constructor_methods const& x)
<< tab(2) << "{}" << endl; << tab(2) << "{}" << endl;
// Struct operator() // Struct operator()
out << tab(2) << "void operator()(Eo* _obj_eoid)" << endl out << tab(2) << "void operator()(Eo* _obj_eo_self)" << endl
<< tab(2) << "{" << endl << tab(2) << "{" << endl
<< tab(3) << "::" << c.impl << "(_obj_eoid" << (c.params.empty() ? "" : ", ") << tab(3) << "::" << c.impl << "(_obj_eo_self" << (c.params.empty() ? "" : ", ")
<< parameters_forward_to_c(c.params) << ");" << endl << parameters_forward_to_c(c.params) << ");" << endl
<< tab(2) << "}" << endl; << tab(2) << "}" << endl;
@ -580,10 +580,10 @@ operator<<(std::ostream& out, function_call_constructor_methods const& x)
<< tab(2) << "Eo* _ret_eo = eo_add_ref(" << x._cls.eo_name << ", _p._eo_raw"; << tab(2) << "Eo* _ret_eo = eo_add_ref(" << x._cls.eo_name << ", _p._eo_raw";
for (it = first; it != last; ++it) for (it = first; it != last; ++it)
{ {
out << ", _c" << (it-first) << "(eoid)"; out << ", _c" << (it-first) << "(eo_self)";
} }
if (!x._cls.optional_constructors.empty()) if (!x._cls.optional_constructors.empty())
out << ", ::efl::eolian::call_ctors(eoid, _opts...)"; out << ", ::efl::eolian::call_ctors(eo_self, _opts...)";
out << ");" << endl << endl; out << ");" << endl << endl;
for (it = first; it != last; ++it) for (it = first; it != last; ++it)