Author: martin
Date: 2005-04-15 04:52:39 -0400 (Fri, 15 Apr 2005)
New Revision: 43029
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/convert.cs
Log:
**** Merged r41397 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-15 08:52:09 UTC (rev 43028)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-15 08:52:39 UTC (rev 43029)
@@ -1,3 +1,8 @@
+2005-03-03 Dan Winship <[EMAIL PROTECTED]>
+
+ * convert.cs (Error_CannotImplicitConversion): fix two bugs in
+ the warning message [#73219]
+
2005-03-03 Raja R Harinath <[EMAIL PROTECTED]>
Fix compile with MCS 1.0.0.0.
Modified: trunk/mcs/gmcs/convert.cs
===================================================================
--- trunk/mcs/gmcs/convert.cs 2005-04-15 08:52:09 UTC (rev 43028)
+++ trunk/mcs/gmcs/convert.cs 2005-04-15 08:52:39 UTC (rev 43029)
@@ -1405,8 +1405,8 @@
if (source.Name == target.Name){
Report.ExtraInformation (loc,
String.Format (
- "The type {0} has two
conflicting definitons, one comes from {0} and the other from {1}",
- source.Assembly.FullName,
target.Assembly.FullName));
+ "The type {0} has two
conflicting definitions, one comes from {1} and the other from {2}",
+ source.Name,
source.Assembly.FullName, target.Assembly.FullName));
}
Report.Error (29, loc, "Cannot convert implicitly from
{0} to `{1}'",
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
