From b32780fa6f9df04e465c10a1c9137abc494776a6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Sat, 31 May 2008 19:10:14 +0000 Subject: [PATCH] Don't complain about incompatible signal handlers when using signals in MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-05-31 Jürg Billeter * vala/valadatatype.vala: Don't complain about incompatible signal handlers when using signals in generic types svn path=/trunk/; revision=1522 --- ChangeLog | 7 +++++++ vala/valadatatype.vala | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 309e858..30a6198 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-05-31 Jürg Billeter + * vala/valadatatype.vala: + + Don't complain about incompatible signal handlers when using + signals in generic types + +2008-05-31 Jürg Billeter + * vapi/packages/gstreamer-0.10/: Fix gst_value_get_buffer and gst_value_get_structure bindings, diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala index ad56ecb..ff6f076 100644 --- a/vala/valadatatype.vala +++ b/vala/valadatatype.vala @@ -270,14 +270,17 @@ public abstract class Vala.DataType : CodeNode { return false; } + /* temporarily ignore type parameters */ + if (type_parameter != null || type2.type_parameter != null) { + return true; + } + if (type2.data_type != data_type) { // FIXME: allow this type reference to refer to a // subtype of the type type2 is referring to return false; } - if (type2.type_parameter != type_parameter) { - return false; - } + if (type2.floating_reference != floating_reference) { return false; } -- 2.7.4