From: Jason Merrill <jason@redhat.com>
Date: Wed, 19 Mar 2003 18:18:05 +0000 (-0500)
Subject: PR c++/8316, c++/9315, c++/10136
X-Git-Tag: releases/gcc-3.2.3~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99fd67e511cb71461d80b41fb69ed21782387ec4;p=thirdparty%2Fgcc.git

PR c++/8316, c++/9315, c++/10136

        PR c++/8316, c++/9315, c++/10136
        * call.c (joust): Improve wording.

From-SVN: r64587
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 888fcb988a23..aaf965806e61 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-19  Jason Merrill  <jason@redhat.com>
+
+	PR c++/8316, c++/9315, c++/10136
+	* call.c (joust): Improve wording.
+
 2003-03-17  Jason Merrill  <jason@redhat.com>
 
 	* decl.c (finish_function): Don't skip a block.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 6d0c84de103b..c94068842a88 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5501,11 +5501,9 @@ tweak:
       if (winner)
         {
 	  if (warn)
-	    {
-	      pedwarn ("choosing `%D' over `%D'", w->fn, l->fn);
-	      pedwarn (
-"  because worst conversion for the former is better than worst conversion for the latter");
-	    }
+	    pedwarn ("ISO C++ says that `%D' and `%D' are ambiguous \
+even though the worst conversion for the former is better than the worst \
+conversion for the latter", w->fn, l->fn);
 	  else
 	    add_warning (w, l);
           return winner;