From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 25 Nov 2018 17:27:32 +0000 (+0100)
Subject: codegen: Actually create method cast for base interface method as needed
X-Git-Tag: 0.43.1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0fa1dd46a86b01f4d72bbcaf69bddb1f31dcf39;p=thirdparty%2Fvala.git

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.
---

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);