Author: marek
Date: 2007-10-31 13:05:35 -0500 (Wed, 31 Oct 2007)
New Revision: 88591
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/decl.cs
Log:
2007-10-31 Marek Safar <[EMAIL PROTECTED]>
A fix for bug #338102
* decl.cs (CheckExistingMembersOverloads): Workaround issue with generic
methods registered as non-generics.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2007-10-31 18:04:52 UTC (rev 88590)
+++ trunk/mcs/mcs/ChangeLog 2007-10-31 18:05:35 UTC (rev 88591)
@@ -1,5 +1,11 @@
2007-10-31 Marek Safar <[EMAIL PROTECTED]>
+ A fix for bug #338102
+ * decl.cs (CheckExistingMembersOverloads): Workaround issue with generic
+ methods registered as non-generics.
+
+2007-10-31 Marek Safar <[EMAIL PROTECTED]>
+
A fix for bugs #337712, #324490
* delegate.cs: Delegate covariance and contravariance is not allowed for
value types.
Modified: trunk/mcs/mcs/decl.cs
===================================================================
--- trunk/mcs/mcs/decl.cs 2007-10-31 18:04:52 UTC (rev 88590)
+++ trunk/mcs/mcs/decl.cs 2007-10-31 18:05:35 UTC (rev 88591)
@@ -2616,7 +2616,14 @@
if ((ce.EntryType & EntryType.Property) != 0) {
p_types = TypeManager.GetArgumentTypes
((PropertyInfo) ce.Member);
} else {
- pd = TypeManager.GetParameterData
((MethodBase)ce.Member);
+ MethodBase mb = (MethodBase) ce.Member;
+
+ // TODO: This is more like a hack,
because we are adding generic methods
+ // twice with and without arity name
+ if (mb.IsGenericMethod &&
!member.MemberName.IsGeneric)
+ continue;
+
+ pd = TypeManager.GetParameterData (mb);
p_types = pd.Types;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
