summaryrefslogtreecommitdiff
path: root/src/lib/eolian_cxx
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2016-06-09 18:49:27 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-06-09 18:53:31 -0300
commit7b63ecf4f6d9446e221047bab257910ae7302446 (patch)
treefdc8606a835f01260424ef4459b25d2f52a1c303 /src/lib/eolian_cxx
parenta4f64d6fcb3de6ff650e9a09b09c69edbb862146 (diff)
eolian_cxx: Fix build after scope_get changes
Diffstat (limited to 'src/lib/eolian_cxx')
-rw-r--r--src/lib/eolian_cxx/grammar/klass_def.hpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/eolian_cxx/grammar/klass_def.hpp b/src/lib/eolian_cxx/grammar/klass_def.hpp
index 8a40dbdbe5..9cfd8304d9 100644
--- a/src/lib/eolian_cxx/grammar/klass_def.hpp
+++ b/src/lib/eolian_cxx/grammar/klass_def.hpp
@@ -470,7 +470,7 @@ struct function_def
470 } 470 }
471 c_name = eolian_function_full_c_name_get(function, type, EINA_FALSE); 471 c_name = eolian_function_full_c_name_get(function, type, EINA_FALSE);
472 is_beta = eolian_function_is_beta(function); 472 is_beta = eolian_function_is_beta(function);
473 is_protected = eolian_function_scope_get(function) == EOLIAN_SCOPE_PROTECTED; 473 is_protected = eolian_function_scope_get(function, type) == EOLIAN_SCOPE_PROTECTED;
474 } 474 }
475}; 475};
476 476
@@ -610,23 +610,24 @@ struct klass_def
610 if(type == EOLIAN_PROPERTY) 610 if(type == EOLIAN_PROPERTY)
611 { 611 {
612 if(! ::eolian_function_is_legacy_only(function, EOLIAN_PROP_GET) 612 if(! ::eolian_function_is_legacy_only(function, EOLIAN_PROP_GET)
613 && ::eolian_function_scope_get(function) != EOLIAN_SCOPE_PRIVATE) 613 && ::eolian_function_scope_get(function, type) != EOLIAN_SCOPE_PRIVATE)
614 functions.push_back({function, EOLIAN_PROP_GET}); 614 functions.push_back({function, EOLIAN_PROP_GET});
615 if(! ::eolian_function_is_legacy_only(function, EOLIAN_PROP_SET) 615 if(! ::eolian_function_is_legacy_only(function, EOLIAN_PROP_SET)
616 && ::eolian_function_scope_get(function) != EOLIAN_SCOPE_PRIVATE) 616 && ::eolian_function_scope_get(function, type) != EOLIAN_SCOPE_PRIVATE)
617 functions.push_back({function, EOLIAN_PROP_SET}); 617 functions.push_back({function, EOLIAN_PROP_SET});
618 } 618 }
619 else 619 else
620 if(! ::eolian_function_is_legacy_only(function, type) 620 if(! ::eolian_function_is_legacy_only(function, type)
621 && ::eolian_function_scope_get(function) != EOLIAN_SCOPE_PRIVATE) 621 && ::eolian_function_scope_get(function, type) != EOLIAN_SCOPE_PRIVATE)
622 functions.push_back({function, type}); 622 functions.push_back({function, type});
623 } 623 }
624 for(efl::eina::iterator<Eolian_Function const> eolian_functions ( ::eolian_class_functions_get(klass, EOLIAN_METHOD)) 624 for(efl::eina::iterator<Eolian_Function const> eolian_functions ( ::eolian_class_functions_get(klass, EOLIAN_METHOD))
625 , functions_last; eolian_functions != functions_last; ++eolian_functions) 625 , functions_last; eolian_functions != functions_last; ++eolian_functions)
626 { 626 {
627 Eolian_Function const* function = &*eolian_functions; 627 Eolian_Function const* function = &*eolian_functions;
628 Eolian_Function_Type type = ::eolian_function_type_get(function);
628 if(! ::eolian_function_is_legacy_only(function, EOLIAN_METHOD) 629 if(! ::eolian_function_is_legacy_only(function, EOLIAN_METHOD)
629 && ::eolian_function_scope_get(function) != EOLIAN_SCOPE_PRIVATE) 630 && ::eolian_function_scope_get(function, type) != EOLIAN_SCOPE_PRIVATE)
630 functions.push_back({function, EOLIAN_METHOD}); 631 functions.push_back({function, EOLIAN_METHOD});
631 } 632 }
632 std::function<void(Eolian_Class const*)> inherit_algo = 633 std::function<void(Eolian_Class const*)> inherit_algo =