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 888fcb988a23efa328213fe424311f1b7e80c6a1..aaf965806e616f7f3cd6e32c7af948c6901c292b 100644 (file)
--- 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 6d0c84de103b95a7eecddd7126a96739243bc0bd..c94068842a8840766c27c60de5868a1b3fb87cbd 100644 (file)
--- 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;