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 eee0f3d..c8f8e82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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
 
 2007-09-02  Mathias Hasselmann  <mathias.hasselmann@gmx.de>

diff --git a/gobject/valacodegeneratormethod.vala b/gobject/valacodegeneratormethod.vala
index ee54805..509ce68 100644 (file)
--- 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 */