Author: martin
Date: 2005-04-20 10:23:26 -0400 (Wed, 20 Apr 2005)
New Revision: 43334
Modified:
trunk/mcs/gmcs/convert.cs
trunk/mcs/gmcs/driver.cs
trunk/mcs/gmcs/parameter.cs
trunk/mcs/gmcs/typemanager.cs
Log:
**** Merged r43234 from MCS ****
Modified: trunk/mcs/gmcs/convert.cs
===================================================================
--- trunk/mcs/gmcs/convert.cs 2005-04-20 14:15:45 UTC (rev 43333)
+++ trunk/mcs/gmcs/convert.cs 2005-04-20 14:23:26 UTC (rev 43334)
@@ -1966,7 +1966,6 @@
return ne;
}
- skip_explicit:
if (ec.InUnsafe){
if (target_type.IsPointer){
if (expr_type.IsPointer)
Modified: trunk/mcs/gmcs/driver.cs
===================================================================
--- trunk/mcs/gmcs/driver.cs 2005-04-20 14:15:45 UTC (rev 43333)
+++ trunk/mcs/gmcs/driver.cs 2005-04-20 14:23:26 UTC (rev 43334)
@@ -1789,8 +1789,6 @@
// This is the only public entry point
//
public class CompilerCallableEntryPoint : MarshalByRefObject {
- static bool used = false;
-
public static bool InvokeCompiler (string [] args, TextWriter
error)
{
Report.Stderr = error;
Modified: trunk/mcs/gmcs/parameter.cs
===================================================================
--- trunk/mcs/gmcs/parameter.cs 2005-04-20 14:15:45 UTC (rev 43333)
+++ trunk/mcs/gmcs/parameter.cs 2005-04-20 14:23:26 UTC (rev 43334)
@@ -63,7 +63,7 @@
builder = mb.DefineParameter (0,
ParameterAttributes.None, "");
}
catch (ArgumentOutOfRangeException) {
- Report.Warning (-28, location, "The Microsoft
.NET Runtime 1.x does not permit setting custom attributes on the return type");
+ Report.Warning (-24, location, "The Microsoft
.NET Runtime 1.x does not permit setting custom attributes on the return type");
}
}
Modified: trunk/mcs/gmcs/typemanager.cs
===================================================================
--- trunk/mcs/gmcs/typemanager.cs 2005-04-20 14:15:45 UTC (rev 43333)
+++ trunk/mcs/gmcs/typemanager.cs 2005-04-20 14:23:26 UTC (rev 43334)
@@ -2514,7 +2514,7 @@
new Type [] { typeof (Type), typeof (bool)},
null);
if (declare_local_method == null){
- Report.Warning (-24, new Location (-1),
+ Report.Warning (-30, new Location (-1),
"This version of the runtime
does not support making pinned local variables. " +
"This code may cause errors on a
runtime with a moving GC");
return ig.DeclareLocal (t);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
