Author: martin
Date: 2006-01-18 12:43:38 -0500 (Wed, 18 Jan 2006)
New Revision: 55742
Added:
branches/mono-1-1-13/mcs/tests/gtest-240.cs
Modified:
branches/mono-1-1-13/mcs/gmcs/ChangeLog
branches/mono-1-1-13/mcs/gmcs/class.cs
Log:
**** Merged r55737 from HEAD ****
Modified: branches/mono-1-1-13/mcs/gmcs/ChangeLog
===================================================================
--- branches/mono-1-1-13/mcs/gmcs/ChangeLog 2006-01-18 17:38:12 UTC (rev
55741)
+++ branches/mono-1-1-13/mcs/gmcs/ChangeLog 2006-01-18 17:43:38 UTC (rev
55742)
@@ -1,5 +1,11 @@
2006-01-18 Martin Baulig <[EMAIL PROTECTED]>
+ * class.cs (TypeContainer.AddToMemberContainer): Use
+ `symbol.MemberName.MethodName' instead of just `symbol.Name';
+ fixes #77124.
+
+2006-01-18 Martin Baulig <[EMAIL PROTECTED]>
+
Fix #76417: a generic class may now have methods which may unify
for some type parameter substitutions.
Modified: branches/mono-1-1-13/mcs/gmcs/class.cs
===================================================================
--- branches/mono-1-1-13/mcs/gmcs/class.cs 2006-01-18 17:38:12 UTC (rev
55741)
+++ branches/mono-1-1-13/mcs/gmcs/class.cs 2006-01-18 17:43:38 UTC (rev
55742)
@@ -486,7 +486,7 @@
public bool AddToMemberContainer (MemberCore symbol)
{
- return AddToContainer (symbol, symbol.Name);
+ return AddToContainer (symbol,
symbol.MemberName.MethodName);
}
protected virtual bool AddToTypeContainer (DeclSpace ds)
Copied: branches/mono-1-1-13/mcs/tests/gtest-240.cs (from rev 55737,
trunk/mcs/tests/gtest-240.cs)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches