Author: raja
Date: 2005-04-19 04:01:53 -0400 (Tue, 19 Apr 2005)
New Revision: 43239

Modified:
   trunk/mcs/mcs/ChangeLog
   trunk/mcs/mcs/decl.cs
Log:
* decl.cs (AddMethods): Use the declaring type of the problem
method to determine if we want to squash a warning.


Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog     2005-04-19 07:42:12 UTC (rev 43238)
+++ trunk/mcs/mcs/ChangeLog     2005-04-19 08:01:53 UTC (rev 43239)
@@ -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/mcs/decl.cs
===================================================================
--- trunk/mcs/mcs/decl.cs       2005-04-19 07:42:12 UTC (rev 43238)
+++ trunk/mcs/mcs/decl.cs       2005-04-19 08:01:53 UTC (rev 43239)
@@ -1436,8 +1436,8 @@
                                                //
                                                // Also, CSC 1.1 appears to 
emit 'Finalize' without a newslot.
                                                //
-                                               if ((member.Name == "Invoke" && 
type.IsSubclassOf (TypeManager.multicast_delegate_type)) ||
-                                                   (member.Name == "Finalize" 
&& member.GetParameters().Length == 0))
+                                               if ((curr.Name == "Invoke" && 
curr.DeclaringType.IsSubclassOf (TypeManager.multicast_delegate_type)) ||
+                                                   (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

Reply via email to