Author: martin
Date: 2005-04-15 12:07:35 -0400 (Fri, 15 Apr 2005)
New Revision: 43060
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/class.cs
Log:
**** Merged r41708 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-15 16:06:26 UTC (rev 43059)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-15 16:07:35 UTC (rev 43060)
@@ -1,3 +1,7 @@
+2005-03-11 Marek Safar <[EMAIL PROTECTED]>
+
+ * class.cs (StaticClass.DefineContainerMembers): Added CS0720.
+
2005-03-11 Zoltan Varga <[EMAIL PROTECTED]>
* attribute.cs expression.cs: Get rid of some allocations.
Modified: trunk/mcs/gmcs/class.cs
===================================================================
--- trunk/mcs/gmcs/class.cs 2005-04-15 16:06:26 UTC (rev 43059)
+++ trunk/mcs/gmcs/class.cs 2005-04-15 16:07:35 UTC (rev 43060)
@@ -2947,6 +2947,11 @@
if ((m.ModFlags & Modifiers.PROTECTED) != 0)
Report.Warning (628, 4, m.Location,
"'{0}': new protected member declared in static class", m.GetSignatureForError
(this));
+ if (m is Indexer) {
+ Report.Error (720, m.Location, "'{0}':
cannot declare indexers in a static class", m.GetSignatureForError (this));
+ continue;
+ }
+
if ((m.ModFlags & Modifiers.STATIC) != 0 || m
is Enum || m is Delegate)
continue;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
