2005-11-11 Zoltan Varga <vargaz@gmail.com>

	* Type.cs (GetPseudoCustomAttributes): Return ComImportAttribute as well.

svn path=/trunk/mcs/; revision=52919

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 7fc0574d513e9828b86e64c05743848567be98a4..1a3f763f00f99bc5ba879862ee0c81c94cd099b1 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-11  Zoltan Varga  <vargaz@gmail.com>
+
+       * Type.cs (GetPseudoCustomAttributes): Return ComImportAttribute as well.
+
 2005-11-11  Lluis Sanchez Gual  <lluis@novell.com>
 
        * 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 7e5b9ff89b8eef5179a69631065dc3339cc9a1cf..33528209d2330e93da92cdb03f5bb6f58c330412 100644 (file)
--- 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;
                }