Author: martin
Date: 2005-04-15 04:50:43 -0400 (Fri, 15 Apr 2005)
New Revision: 43026
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/class.cs
Log:
**** Merged r41364 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-15 08:41:19 UTC (rev 43025)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-15 08:50:43 UTC (rev 43026)
@@ -1,3 +1,7 @@
+2005-03-02 Marek Safar <[EMAIL PROTECTED]>
+
+ * report.cs (StaticClass.DefineContainerMembers): Add warning 628.
+
2005-03-02 Raja R Harinath <[EMAIL PROTECTED]>
Unify DeclSpace.LookupType and DeclSpace.FindType.
Modified: trunk/mcs/gmcs/class.cs
===================================================================
--- trunk/mcs/gmcs/class.cs 2005-04-15 08:41:19 UTC (rev 43025)
+++ trunk/mcs/gmcs/class.cs 2005-04-15 08:50:43 UTC (rev 43026)
@@ -2979,6 +2979,9 @@
continue;
}
+ 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.ModFlags & Modifiers.STATIC) != 0 || m
is Enum || m is Delegate)
continue;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
