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

eolian_cxx: Fix build after scope_get changes

This commit is contained in:
Lauro Moura 2016-06-09 18:49:27 -03:00 committed by Felipe Magno de Almeida
parent a4f64d6fcb
commit 7b63ecf4f6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/eolian_cxx/grammar/klass_def.hpp
View File

@ -470,7 +470,7 @@ struct function_def
} }
c_name = eolian_function_full_c_name_get(function, type, EINA_FALSE); c_name = eolian_function_full_c_name_get(function, type, EINA_FALSE);
is_beta = eolian_function_is_beta(function); is_beta = eolian_function_is_beta(function);
is_protected = eolian_function_scope_get(function) == EOLIAN_SCOPE_PROTECTED; is_protected = eolian_function_scope_get(function, type) == EOLIAN_SCOPE_PROTECTED;
} }
}; };
@ -610,23 +610,24 @@ struct klass_def
if(type == EOLIAN_PROPERTY) if(type == EOLIAN_PROPERTY)
{ {
if(! ::eolian_function_is_legacy_only(function, EOLIAN_PROP_GET) if(! ::eolian_function_is_legacy_only(function, EOLIAN_PROP_GET)
&& ::eolian_function_scope_get(function) != EOLIAN_SCOPE_PRIVATE) && ::eolian_function_scope_get(function, type) != EOLIAN_SCOPE_PRIVATE)
functions.push_back({function, EOLIAN_PROP_GET}); functions.push_back({function, EOLIAN_PROP_GET});
if(! ::eolian_function_is_legacy_only(function, EOLIAN_PROP_SET) if(! ::eolian_function_is_legacy_only(function, EOLIAN_PROP_SET)
&& ::eolian_function_scope_get(function) != EOLIAN_SCOPE_PRIVATE) && ::eolian_function_scope_get(function, type) != EOLIAN_SCOPE_PRIVATE)
functions.push_back({function, EOLIAN_PROP_SET}); functions.push_back({function, EOLIAN_PROP_SET});
} }
else else
if(! ::eolian_function_is_legacy_only(function, type) if(! ::eolian_function_is_legacy_only(function, type)
&& ::eolian_function_scope_get(function) != EOLIAN_SCOPE_PRIVATE) && ::eolian_function_scope_get(function, type) != EOLIAN_SCOPE_PRIVATE)
functions.push_back({function, type}); functions.push_back({function, type});
} }
for(efl::eina::iterator<Eolian_Function const> eolian_functions ( ::eolian_class_functions_get(klass, EOLIAN_METHOD)) for(efl::eina::iterator<Eolian_Function const> eolian_functions ( ::eolian_class_functions_get(klass, EOLIAN_METHOD))
, functions_last; eolian_functions != functions_last; ++eolian_functions) , functions_last; eolian_functions != functions_last; ++eolian_functions)
{ {
Eolian_Function const* function = &*eolian_functions; Eolian_Function const* function = &*eolian_functions;
Eolian_Function_Type type = ::eolian_function_type_get(function);
if(! ::eolian_function_is_legacy_only(function, EOLIAN_METHOD) if(! ::eolian_function_is_legacy_only(function, EOLIAN_METHOD)
&& ::eolian_function_scope_get(function) != EOLIAN_SCOPE_PRIVATE) && ::eolian_function_scope_get(function, type) != EOLIAN_SCOPE_PRIVATE)
functions.push_back({function, EOLIAN_METHOD}); functions.push_back({function, EOLIAN_METHOD});
} }
std::function<void(Eolian_Class const*)> inherit_algo = std::function<void(Eolian_Class const*)> inherit_algo =