← Back to branch summary

~ubuntu-branches/ubuntu/hardy/vala/hardy

« back to all changes in this revision

Viewing changes to gobject/valaccodegeneratormemberaccess.vala

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2007-11-26 08:16:57 UTC
  • mto: This revision was merged to the branch mainline in revision 5.
  • Revision ID: james.westby@ubuntu.com-20071126081657-llrmnybq8lquthjj
Tags: upstream-0.1.5
Import upstream version 0.1.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
gobject/valaccodegeneratormemberaccess.vala
63
63
                                instance_target_type.data_type = (DataType) f.parent_symbol;
64
64
                                CCodeExpression typed_inst = get_implicit_cast_expression (pub_inst, instance_expression_type, instance_target_type);
65
65
 
 
66
                                bool is_gtypeinstance = (instance_target_type.data_type.is_subtype_of (gtypeinstance_type));
 
67
 
66
68
                                CCodeExpression inst;
67
 
                                if (f.access == SymbolAccessibility.PRIVATE) {
 
69
                                if (is_gtypeinstance && f.access == SymbolAccessibility.PRIVATE) {
68
70
                                        inst = new CCodeMemberAccess.pointer (typed_inst, "priv");
69
71
                                } else {
70
72
                                        inst = typed_inst;
71
73
                                }
72
 
                                if (((DataType) f.parent_symbol).is_reference_type ()) {
 
74
                                if (instance_target_type.data_type.is_reference_type ()) {
73
75
                                        expr.ccodenode = new CCodeMemberAccess.pointer (inst, f.get_cname ());
74
76
                                } else {
75
77
                                        expr.ccodenode = new CCodeMemberAccess (inst, f.get_cname ());