From 619c81336a7b76a128970beecac5cf178f8a66b3 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Fri, 11 Nov 2005 17:50:08 +0000 Subject: [PATCH] 2005-11-11 Zoltan Varga * Type.cs (GetPseudoCustomAttributes): Return ComImportAttribute as well. svn path=/trunk/mcs/; revision=52919 --- mcs/class/corlib/System/ChangeLog | 4 ++++ mcs/class/corlib/System/Type.cs | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog index 7fc0574d513..1a3f763f00f 100644 --- a/mcs/class/corlib/System/ChangeLog +++ b/mcs/class/corlib/System/ChangeLog @@ -1,3 +1,7 @@ +2005-11-11 Zoltan Varga + + * Type.cs (GetPseudoCustomAttributes): Return ComImportAttribute as well. + 2005-11-11 Lluis Sanchez Gual * TimeZone.cs: Removed incorrect double-check lock and unneeded diff --git a/mcs/class/corlib/System/Type.cs b/mcs/class/corlib/System/Type.cs index 7e5b9ff89b8..33528209d23 100644 --- a/mcs/class/corlib/System/Type.cs +++ b/mcs/class/corlib/System/Type.cs @@ -1260,6 +1260,8 @@ namespace System { /* IsSerializable returns true for delegates/enums as well */ if ((Attributes & TypeAttributes.Serializable) != 0) count ++; + if ((Attributes & TypeAttributes.Import) != 0) + count ++; if (count == 0) return null; @@ -1268,6 +1270,8 @@ namespace System { if ((Attributes & TypeAttributes.Serializable) != 0) attrs [count ++] = new SerializableAttribute (); + if ((Attributes & TypeAttributes.Import) != 0) + attrs [count ++] = new ComImportAttribute (); return attrs; } -- 2.25.1