Author: martin
Date: 2005-04-30 03:53:37 -0400 (Sat, 30 Apr 2005)
New Revision: 43816
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/cs-parser.jay
Log:
**** Merged r43570 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-30 07:53:08 UTC (rev 43815)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-30 07:53:37 UTC (rev 43816)
@@ -1,3 +1,8 @@
+2005-04-25 Ben Maurer <[EMAIL PROTECTED]>
+
+ * cs-parser.jay: Use the prefered version of -unsafe in error
+ message.
+
2005-04-22 Marek Safar <[EMAIL PROTECTED]>
* driver.cs (CompilerCallableEntryPoint.Invoke): Reset under any
Modified: trunk/mcs/gmcs/cs-parser.jay
===================================================================
--- trunk/mcs/gmcs/cs-parser.jay 2005-04-30 07:53:08 UTC (rev 43815)
+++ trunk/mcs/gmcs/cs-parser.jay 2005-04-30 07:53:37 UTC (rev 43816)
@@ -4638,7 +4638,7 @@
{
if (!RootContext.Unsafe){
Report.Error (227, lexer.Location,
- "Unsafe code can only be used if --unsafe is
used");
+ "Unsafe code can only be used if -unsafe is
used");
}
} block {
$$ = new Unsafe ((Block) $3);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
