Author: martin
Date: 2006-01-15 23:08:23 -0500 (Sun, 15 Jan 2006)
New Revision: 55617
Added:
branches/mono-1-1-13/mcs/tests/gtest-235-exe.cs
branches/mono-1-1-13/mcs/tests/gtest-235-lib.cs
Modified:
branches/mono-1-1-13/mcs/gmcs/ChangeLog
branches/mono-1-1-13/mcs/gmcs/generic.cs
Log:
**** Merged r55614 from HEAD ****
Modified: branches/mono-1-1-13/mcs/gmcs/ChangeLog
===================================================================
--- branches/mono-1-1-13/mcs/gmcs/ChangeLog 2006-01-16 02:59:34 UTC (rev
55616)
+++ branches/mono-1-1-13/mcs/gmcs/ChangeLog 2006-01-16 04:08:23 UTC (rev
55617)
@@ -1,5 +1,9 @@
2006-01-16 Martin Baulig <[EMAIL PROTECTED]>
+ * generic.cs (ConstraintChecker.CheckConstraint): Fix #77167.
+
+2006-01-16 Martin Baulig <[EMAIL PROTECTED]>
+
* typemanager.cs (TypeManager.CSharpSignature): Make this work for
ctors; fixes #77250.
Modified: branches/mono-1-1-13/mcs/gmcs/generic.cs
===================================================================
--- branches/mono-1-1-13/mcs/gmcs/generic.cs 2006-01-16 02:59:34 UTC (rev
55616)
+++ branches/mono-1-1-13/mcs/gmcs/generic.cs 2006-01-16 04:08:23 UTC (rev
55617)
@@ -1597,6 +1597,9 @@
if (ct.ResolveAsTypeStep (ec) == null)
return false;
ctype = ct.Type;
+ } else if (ctype.IsGenericParameter) {
+ int pos = ctype.GenericParameterPosition;
+ ctype = atypes [pos];
}
return Convert.ImplicitStandardConversionExists (ec,
expr, ctype);
Copied: branches/mono-1-1-13/mcs/tests/gtest-235-exe.cs (from rev 55614,
trunk/mcs/tests/gtest-235-exe.cs)
Copied: branches/mono-1-1-13/mcs/tests/gtest-235-lib.cs (from rev 55614,
trunk/mcs/tests/gtest-235-lib.cs)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
