Author: martin
Date: 2005-04-20 10:24:41 -0400 (Wed, 20 Apr 2005)
New Revision: 43336
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/decl.cs
Log:
**** Merged r43239 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-20 14:23:55 UTC (rev 43335)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-20 14:24:41 UTC (rev 43336)
@@ -1,3 +1,8 @@
+2005-04-19 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * decl.cs (AddMethods): Use the declaring type of the problem
+ method to determine if we want to squash a warning.
+
2005-04-19 Marek Safar <[EMAIL PROTECTED]>
* attribute.cs: Removed debug output.
Modified: trunk/mcs/gmcs/decl.cs
===================================================================
--- trunk/mcs/gmcs/decl.cs 2005-04-20 14:23:55 UTC (rev 43335)
+++ trunk/mcs/gmcs/decl.cs 2005-04-20 14:24:41 UTC (rev 43336)
@@ -1767,8 +1767,8 @@
//
// Also, CSC 1.1 appears to
emit 'Finalize' without a newslot.
//
- if ((member.Name == "Invoke" &&
TypeManager.IsDelegateType (type)) ||
- (member.Name == "Finalize"
&& member.GetParameters().Length == 0))
+ if ((curr.Name == "Invoke" &&
TypeManager.IsDelegateType (curr.DeclaringType)) ||
+ (curr.Name == "Finalize" &&
curr.GetParameters().Length == 0 && curr.DeclaringType ==
TypeManager.object_type))
break;
Report.SymbolRelatedToPreviousError (base_method);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
