Author: martin
Date: 2005-04-18 11:32:18 -0400 (Mon, 18 Apr 2005)
New Revision: 43225
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/class.cs
trunk/mcs/gmcs/decl.cs
Log:
**** Merged r42431 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-18 15:31:34 UTC (rev 43224)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-18 15:32:18 UTC (rev 43225)
@@ -1,3 +1,11 @@
+2005-03-31 Marek Safar <[EMAIL PROTECTED]>
+
+ Fix #74241
+ * class.cs (AbstractPropertyEventMethod.EmitMethod): Enable emit method
+ customization.
+
+ * decl.cs (MemberCache.AddMethods): Fix infinite loop.
+
2005-03-31 Raja R Harinath <[EMAIL PROTECTED]>
Fix difference in behaviour with commandline invocation.
Modified: trunk/mcs/gmcs/class.cs
===================================================================
--- trunk/mcs/gmcs/class.cs 2005-04-18 15:31:34 UTC (rev 43224)
+++ trunk/mcs/gmcs/class.cs 2005-04-18 15:32:18 UTC (rev 43225)
@@ -6258,7 +6258,7 @@
public virtual void Emit (TypeContainer container)
{
- method_data.Emit (container, this);
+ EmitMethod (container);
if (declarative_security != null) {
foreach (DictionaryEntry de in
declarative_security) {
@@ -6269,6 +6269,11 @@
block = null;
}
+ protected virtual void EmitMethod (TypeContainer container)
+ {
+ method_data.Emit (container, this);
+ }
+
public override bool IsClsCompliaceRequired(DeclSpace ds)
{
return false;
@@ -7210,10 +7215,10 @@
}
- public override void Emit (TypeContainer tc)
+ protected override void EmitMethod (TypeContainer tc)
{
if (block != null) {
- base.Emit (tc);
+ base.EmitMethod (tc);
return;
}
Modified: trunk/mcs/gmcs/decl.cs
===================================================================
--- trunk/mcs/gmcs/decl.cs 2005-04-18 15:31:34 UTC (rev 43224)
+++ trunk/mcs/gmcs/decl.cs 2005-04-18 15:32:18 UTC (rev 43225)
@@ -1787,6 +1787,7 @@
" but doesn't
appear to overrided any virtual or abstract method:" +
" it may be
ignored during overload resolution",
TypeManager.CSharpSignature (base_method));
+ break;
}
base_method = new_base_method;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches