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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bb4b6624df18668107bdd23bd65cbb2f78d8fb52..1fde4951d7e78a57174368232bb85038af00963e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 1a1d5c0f2377349cd9a607febb2b9fa5b11e2ced..dd18567d641aa82eff41c3eca3a6cf73ecd55d12 100644 (file)
--- a/gcc/cp/pt.c
+++ b/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;
     }