From: Juerg Billeter <j@bitron.ch>
Date: Sun, 2 Sep 2007 15:45:56 +0000 (+0000)
Subject: fix virtual methods with generic return type
X-Git-Tag: VALA_0_1_4~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a189bf3b26829654dbbb9c3779caeb7c2f392d9d;p=thirdparty%2Fvala.git

fix virtual methods with generic return type

2007-09-02  Juerg Billeter  <j@bitron.ch>

	* gobject/valacodegeneratormethod.vala: fix virtual methods with generic
	  return type

svn path=/trunk/; revision=576
---

diff --git a/ChangeLog b/ChangeLog
index eee0f3d74..c8f8e82e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-02  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valacodegeneratormethod.vala: fix virtual methods with generic
+	  return type
+
 2007-09-02  Jürg Billeter  <j@bitron.ch>
 
 	* vapi/curses.vala: improve Screen class, patch by Ed Schouten
diff --git a/gobject/valacodegeneratormethod.vala b/gobject/valacodegeneratormethod.vala
index ee5480564..509ce682b 100644
--- a/gobject/valacodegeneratormethod.vala
+++ b/gobject/valacodegeneratormethod.vala
@@ -382,7 +382,7 @@ public class Vala.CodeGenerator {
 				vcall.add_argument (new CCodeIdentifier (cparam.name));
 			}
 
-			if (m.return_type.data_type == null) {
+			if (m.return_type.data_type == null && m.return_type.type_parameter == null) {
 				vblock.add_statement (new CCodeExpressionStatement (vcall));
 			} else {
 				/* pass method return value */