summaryrefslogtreecommitdiff
path: root/src/bin/eolian_mono/eolian
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2017-12-06 13:27:27 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2017-12-06 19:11:13 -0300
commit3861f8b01d9dd213fd966b178dcdaf71110e2d76 (patch)
tree48d101af5ab2abb6d94bb0c8909e4eb8624776ac /src/bin/eolian_mono/eolian
parentc5ff7f0f4687ccbd670a8094288eae1d6c536809 (diff)
eolian_mono: Fix build after Eolian_State
Summary: eolian_mono now properly fills Eolian Unit when calling eolian_cxx classes and functions. Reviewers: felipealmeida Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5614
Diffstat (limited to 'src/bin/eolian_mono/eolian')
-rw-r--r--src/bin/eolian_mono/eolian/mono/klass.hh4
-rw-r--r--src/bin/eolian_mono/eolian/mono/parameter.hh4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh b/src/bin/eolian_mono/eolian/mono/klass.hh
index fe2d35dfa6..639e263054 100644
--- a/src/bin/eolian_mono/eolian/mono/klass.hh
+++ b/src/bin/eolian_mono/eolian/mono/klass.hh
@@ -469,7 +469,7 @@ struct klass
469 469
470 for (auto&& c : cls.inherits) 470 for (auto&& c : cls.inherits)
471 { 471 {
472 attributes::klass_def klass(get_klass(c, NULL), NULL); 472 attributes::klass_def klass(get_klass(c, cls.unit), cls.unit);
473 473
474 for (auto&& e : klass.events) 474 for (auto&& e : klass.events)
475 { 475 {
@@ -638,7 +638,7 @@ struct klass
638 // Inherited events 638 // Inherited events
639 for (auto&& c : cls.inherits) 639 for (auto&& c : cls.inherits)
640 { 640 {
641 attributes::klass_def klass(get_klass(c, NULL), NULL); 641 attributes::klass_def klass(get_klass(c, cls.unit), cls.unit);
642 642
643 // FIXME Enable inherited events registration. Beware of conflicting events 643 // FIXME Enable inherited events registration. Beware of conflicting events
644 for (auto&& e : klass.events) 644 for (auto&& e : klass.events)
diff --git a/src/bin/eolian_mono/eolian/mono/parameter.hh b/src/bin/eolian_mono/eolian/mono/parameter.hh
index dcbb0a44d5..e9aa957ad7 100644
--- a/src/bin/eolian_mono/eolian/mono/parameter.hh
+++ b/src/bin/eolian_mono/eolian/mono/parameter.hh
@@ -1135,7 +1135,7 @@ struct native_convert_function_pointer_generator
1135 // Getting the type through C api 1135 // Getting the type through C api
1136 std::string type_name = param.type.original_type.visit(type_name_visitor{}); 1136 std::string type_name = param.type.original_type.visit(type_name_visitor{});
1137 1137
1138 const Eolian_Typedecl *tpd = ::eolian_typedecl_alias_get_by_name(NULL, type_name.c_str()); 1138 const Eolian_Typedecl *tpd = ::eolian_typedecl_alias_get_by_name(param.unit, type_name.c_str());
1139 if (!tpd) 1139 if (!tpd)
1140 { 1140 {
1141 EINA_LOG_ERR("Failed to get typedecl for c type [%s]", param.type.c_type.c_str()); 1141 EINA_LOG_ERR("Failed to get typedecl for c type [%s]", param.type.c_type.c_str());
@@ -1150,7 +1150,7 @@ struct native_convert_function_pointer_generator
1150 EINA_LOG_ERR("Failed to get function pointer info for c type [%s]", param.type.c_type.c_str()); 1150 EINA_LOG_ERR("Failed to get function pointer info for c type [%s]", param.type.c_type.c_str());
1151 return false; 1151 return false;
1152 } 1152 }
1153 attributes::function_def f(fd, EOLIAN_FUNCTION_POINTER, NULL); 1153 attributes::function_def f(fd, EOLIAN_FUNCTION_POINTER, param.unit);
1154 1154
1155 std::string param_name = escape_keyword(param.param_name); 1155 std::string param_name = escape_keyword(param.param_name);
1156 // Allocate GCHandle in "param_name"_handle for param; 1156 // Allocate GCHandle in "param_name"_handle for param;