call.c (joust): Tweak message.

	* call.c (joust): Tweak message.

Sat Aug 23 18:02:59 1997  Mark Mitchell  <mmitchell@usa.net>

	* error.c (type_as_string): Put const/volatile on template type
	parameters where appropriate.

From-SVN: r14919

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 01ac302dd609c729bd14428bacfb2c03f3bc72af..7cd6bedb4e87c48f1f03fffa7b74f884ebec2676 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+Mon Aug 25 14:30:02 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * call.c (joust): Tweak message.
+
+Sat Aug 23 18:02:59 1997  Mark Mitchell  <mmitchell@usa.net>
+
+       * error.c (type_as_string): Put const/volatile on template type
+       parameters where appropriate.
+
 Sat Aug 23 17:47:22 1997  Jeffrey A Law  (law@cygnus.com)
 
        * call.c (strictly_better): Make arguments unsigned ints.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index c26006aaa7887b789fa649f9f650dea34711dc3f..0a8388576757cc66d1163c81becec0dd9b6c14b7 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5854,7 +5854,7 @@ joust (cand1, cand2)
              else
                type1 = TREE_TYPE (t2), type2 = TREE_TYPE (t1);
 
-             cp_warning ("`%T' promotes to `%T', not `%T'",
+             cp_warning ("passing `%T' chooses `%T' over `%T'",
                          type, type1, type2);
              cp_warning ("  in call to `%D'", DECL_NAME (cand1->fn));
            }

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index cc7908c5556237b43f537c8cca6b85b6a3c4278b..b3d68ce0668f91a7db30a2d0e20318b197b8e652 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -230,6 +230,7 @@ dump_type (t, v)
       break;
 
     case TEMPLATE_TYPE_PARM:
+      dump_readonly_or_volatile (t, after);
       if (TYPE_IDENTIFIER (t))
        OB_PUTID (TYPE_IDENTIFIER (t));
       else