Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRavi Pratap M <ravi@mono-cvs.ximian.com>2002-02-11 22:43:18 +0300
committerRavi Pratap M <ravi@mono-cvs.ximian.com>2002-02-11 22:43:18 +0300
commitac7829137e51ed7e6095a469e0c32fd6faa84176 (patch)
tree2ac5d1ddc2623bf7a50656caba4fa0bb7b910aa1
parent672c72cf6b93e0c9d21f4c6cd71c43ff5f7f7312 (diff)
2002-02-11 Ravi Pratap <ravi@ximian.com>
* expression.cs (BetterFunction): Catch hideous bug which was preventing us from detecting ambiguous calls due to implicit casts i.e cs0121. svn path=/trunk/mcs/; revision=2331
-rwxr-xr-xmcs/mcs/ChangeLog6
-rwxr-xr-xmcs/mcs/expression.cs8
2 files changed, 10 insertions, 4 deletions
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 8e1d801ef4c..d7d54367c4d 100755
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-11 Ravi Pratap <ravi@ximian.com>
+
+ * expression.cs (BetterFunction): Catch hideous bug which was
+ preventing us from detecting ambiguous calls due to implicit casts i.e
+ cs0121.
+
2002-01-29 Miguel de Icaza <miguel@ximian.com>
* support.cs (Pair): Remove un-needed method. I figured why I was
diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 65649fc9362..36ef0d5667b 100755
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -2885,9 +2885,9 @@ namespace Mono.CSharp {
x = BetterConversion (ec, a, ct, bt, loc);
y = BetterConversion (ec, a, bt, ct, loc);
-
+
if (x < y)
- break;
+ return 0;
rating1 += x;
rating2 += y;
@@ -3212,8 +3212,8 @@ namespace Mono.CSharp {
chose_params_expanded, loc);
if (x != 1) {
- Console.WriteLine ("Candidate : " + FullMethodDesc (candidate));
- Console.WriteLine ("Best : " + FullMethodDesc (method));
+ //Console.WriteLine ("Candidate : " + FullMethodDesc (candidate));
+ //Console.WriteLine ("Best : " + FullMethodDesc (method));
Report.Error (
121, loc,
"Ambiguous call when selecting function due to implicit casts");