diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-11-25 18:27:32 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-11-25 18:30:43 +0100 |
| commit | d0fa1dd46a86b01f4d72bbcaf69bddb1f31dcf39 (patch) | |
| tree | 471185a1f5a7df4a2185a3f06cadf69dfe1f40fe | |
| parent | b0c0a0ee097ed8968f77cf7b1548e916b7acd8d8 (diff) | |
| download | vala-d0fa1dd46a86b01f4d72bbcaf69bddb1f31dcf39.tar.gz | |
codegen: Actually create method cast for base interface method as needed
Keep the fallback to base method for now.
This will silence some incompatible pointer type warnings.
| -rw-r--r-- | codegen/valagtypemodule.vala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala index 3ce231702..7c1f1cf03 100644 --- a/codegen/valagtypemodule.vala +++ b/codegen/valagtypemodule.vala @@ -1483,10 +1483,11 @@ public class Vala.GTypeModule : GErrorModule { // method inherited from base class var base_method = cl_method; - if (cl_method.base_method != null) { - base_method = cl_method.base_method; - } else if (cl_method.base_interface_method != null) { + if (cl_method.base_interface_method != null) { base_method = cl_method.base_interface_method; + } else if (cl_method.base_method != null) { + //FIXME should this ever be possible here? + base_method = cl_method.base_method; } generate_method_declaration (base_method, cfile); |