From 0f806c42e1d8d5f7773688ea6d6eaba1843fcd0f Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Fri, 30 May 2008 21:05:02 +0000 Subject: [PATCH] remove obsolete code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-05-30 Jürg Billeter * vala/valadatatype.vala: remove obsolete code svn path=/trunk/; revision=1501 --- ChangeLog | 4 ++++ vala/valadatatype.vala | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15932a5..99b4f96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-05-30 Jürg Billeter + * vala/valadatatype.vala: remove obsolete code + +2008-05-30 Jürg Billeter + * vapi/glib-2.0.vapi: fix g_value_copy and g_value_transform bindings, fixes bug 523767 diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala index 586173a..ad56ecb 100644 --- a/vala/valadatatype.vala +++ b/vala/valadatatype.vala @@ -301,18 +301,12 @@ public abstract class Vala.DataType : CodeNode { return ((DelegateType) target_type).delegate_symbol == ((DelegateType) this).delegate_symbol; } - /* only null is compatible to null */ - if (!(target_type is PointerType) && target_type.data_type == null && target_type.type_parameter == null) { - return (data_type == null && type_parameter == null); - } - - if (target_type is PointerType || (target_type.data_type != null && target_type.data_type.get_attribute ("PointerType") != null)) { + if (target_type is PointerType) { /* any reference or array type or pointer type can be cast to a generic pointer */ if (type_parameter != null || (data_type != null && ( data_type.is_reference_type () || - this is DelegateType || - data_type.get_attribute ("PointerType") != null))) { + this is DelegateType))) { return true; } -- 2.7.4