summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2016-03-16 21:11:17 +0100
committerStefan Schmidt <stefan@osg.samsung.com>2016-03-16 21:11:17 +0100
commite981bfc4e8f1ac2eaa2d8c1fa120c4ee27b095c2 (patch)
treebbf31f16ba653db471ff6a03b65e9b3ce69f11b0 /src
parent7cbd8c7b93d7e78ede8d79029ccf468003d44199 (diff)
cxx: follow eoid to eo_self rename in cxx generator and bindings
Bringing efl back to a building state with cxx enabled.
Diffstat (limited to 'src')
-rw-r--r--src/bindings/eo_cxx/eo_cxx_interop.hh6
-rw-r--r--src/bindings/eo_cxx/eo_inherit.hh2
-rw-r--r--src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh8
3 files changed, 8 insertions, 8 deletions
diff --git a/src/bindings/eo_cxx/eo_cxx_interop.hh b/src/bindings/eo_cxx/eo_cxx_interop.hh
index 18af392c83..1e35d0c942 100644
--- a/src/bindings/eo_cxx/eo_cxx_interop.hh
+++ b/src/bindings/eo_cxx/eo_cxx_interop.hh
@@ -472,11 +472,11 @@ F* alloc_static_callback(F&& f)
472 472
473template <typename... Fs> 473template <typename... Fs>
474inline 474inline
475void call_ctors(Eo* _obj_eoid, Fs&&... fs) 475void call_ctors(Eo* _obj_eo_self, Fs&&... fs)
476{ 476{
477 std::initializer_list<int const> const v {(fs(_obj_eoid), 0)...}; 477 std::initializer_list<int const> const v {(fs(_obj_eo_self), 0)...};
478 (void) v; 478 (void) v;
479 (void) _obj_eoid; 479 (void) _obj_eo_self;
480} 480}
481 481
482} } // namespace efl { namespace eolian { 482} } // namespace efl { namespace eolian {
diff --git a/src/bindings/eo_cxx/eo_inherit.hh b/src/bindings/eo_cxx/eo_inherit.hh
index 9639e33e4a..4944dc4bab 100644
--- a/src/bindings/eo_cxx/eo_inherit.hh
+++ b/src/bindings/eo_cxx/eo_inherit.hh
@@ -85,7 +85,7 @@ struct inherit
85 inherit(efl::eo::parent_type _p, Args&& ... args) 85 inherit(efl::eo::parent_type _p, Args&& ... args)
86 { 86 {
87 _eo_cls = detail::create_class<D, E...> (eina::make_index_sequence<sizeof...(E)>()); 87 _eo_cls = detail::create_class<D, E...> (eina::make_index_sequence<sizeof...(E)>());
88 _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, detail::inherit_constructor(eoid, this), ::efl::eolian::call_ctors(eoid, args...)); 88 _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, detail::inherit_constructor(eo_self, this), ::efl::eolian::call_ctors(eo_self, args...));
89 ::efl::eolian::register_ev_del_free_callback(_eo_raw, args...); 89 ::efl::eolian::register_ev_del_free_callback(_eo_raw, args...);
90 } 90 }
91 91
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 2a7091ad02..21395e9c1a 100644
--- a/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
+++ b/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
@@ -158,9 +158,9 @@ operator<<(std::ostream& out, functors_constructor_methods const& x)
158 << tab(2) << "{}" << endl; 158 << tab(2) << "{}" << endl;
159 159
160 // Struct operator() 160 // Struct operator()
161 out << tab(2) << "void operator()(Eo* _obj_eoid)" << endl 161 out << tab(2) << "void operator()(Eo* _obj_eo_self)" << endl
162 << tab(2) << "{" << endl 162 << tab(2) << "{" << endl
163 << tab(3) << "::" << c.impl << "(_obj_eoid" << (c.params.empty() ? "" : ", ") 163 << tab(3) << "::" << c.impl << "(_obj_eo_self" << (c.params.empty() ? "" : ", ")
164 << parameters_forward_to_c(c.params) << ");" << endl 164 << parameters_forward_to_c(c.params) << ");" << endl
165 << tab(2) << "}" << endl; 165 << tab(2) << "}" << endl;
166 166
@@ -580,10 +580,10 @@ operator<<(std::ostream& out, function_call_constructor_methods const& x)
580 << tab(2) << "Eo* _ret_eo = eo_add_ref(" << x._cls.eo_name << ", _p._eo_raw"; 580 << tab(2) << "Eo* _ret_eo = eo_add_ref(" << x._cls.eo_name << ", _p._eo_raw";
581 for (it = first; it != last; ++it) 581 for (it = first; it != last; ++it)
582 { 582 {
583 out << ", _c" << (it-first) << "(eoid)"; 583 out << ", _c" << (it-first) << "(eo_self)";
584 } 584 }
585 if (!x._cls.optional_constructors.empty()) 585 if (!x._cls.optional_constructors.empty())
586 out << ", ::efl::eolian::call_ctors(eoid, _opts...)"; 586 out << ", ::efl::eolian::call_ctors(eo_self, _opts...)";
587 out << ");" << endl << endl; 587 out << ");" << endl << endl;
588 588
589 for (it = first; it != last; ++it) 589 for (it = first; it != last; ++it)