Author: martin
Date: 2005-04-15 04:53:37 -0400 (Fri, 15 Apr 2005)
New Revision: 43031
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/class.cs
Log:
**** Merged r41429 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-15 08:53:05 UTC (rev 43030)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-15 08:53:37 UTC (rev 43031)
@@ -1,3 +1,9 @@
+2005-03-04 Raja R Harinath <[EMAIL PROTECTED]>
+
+ Fix #73282.
+ * class.cs (MethodData.Emit): Pass 'container' to
+ container.GetObsoleteAttribute instead of 'container.Parent'.
+
2005-03-03 Marek Safar <[EMAIL PROTECTED]>
* cs-parser.jay: Add 1534 error test.
Modified: trunk/mcs/gmcs/class.cs
===================================================================
--- trunk/mcs/gmcs/class.cs 2005-04-15 08:53:05 UTC (rev 43030)
+++ trunk/mcs/gmcs/class.cs 2005-04-15 08:53:37 UTC (rev 43031)
@@ -5154,7 +5154,7 @@
else
ec = method.CreateEmitContext (container, null);
- if (method.GetObsoleteAttribute () != null ||
container.GetObsoleteAttribute (container.Parent) != null)
+ if (method.GetObsoleteAttribute () != null ||
container.GetObsoleteAttribute (container) != null)
ec.TestObsoleteMethodUsage = false;
Location loc = method.Location;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
