re PR translation/21768 (ICE in error message due to violation of coding conventions)

	PR c++/21768
	* pt.c (redeclare_class_template): Change error message according
	to coding conventions.

From-SVN: r100206

gcc/cp/ChangeLog

 2005-05-26  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	PR c++/21768
+	* pt.c (redeclare_class_template): Change error message according
+	to coding conventions.
+
+2005-05-26  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
 	* call.c (build_op_delete_call): Fix quoting in error message.
 
 2005-05-25  Richard Henderson  <rth@redhat.com>

gcc/cp/pt.c

@@ -3225,10 +3225,9 @@ redeclare_class_template (tree type, tree parms)
   if (TREE_VEC_LENGTH (parms) != TREE_VEC_LENGTH (tmpl_parms))
     {
       cp_error_at ("previous declaration %qD", tmpl);
-      error ("used %d template parameter%s instead of %d",
-		TREE_VEC_LENGTH (tmpl_parms), 
-		TREE_VEC_LENGTH (tmpl_parms) == 1 ? "" : "s",
-		TREE_VEC_LENGTH (parms));
+      error ("used %d template parameter(s) instead of %d",
+	     TREE_VEC_LENGTH (tmpl_parms), 
+	     TREE_VEC_LENGTH (parms));
       return;
     }