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

gcc/cp/ChangeLog

+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.

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));
 	    }

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