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: r100209

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a40a0349ec7a1346d83468a5c39f28b8feffd93b..55f3c46f788e70921835695e6a380bebebe18fb7 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-19  Release Manager
 
        * GCC 3.4.4 released.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index e5aadc127498c64c0edfcdc2d05cf509a7202365..d97b75072f651c769c3ffb882c3f70a47655cbb6 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3074,10 +3074,9 @@ redeclare_class_template (tree type, tree parms)
   if (TREE_VEC_LENGTH (parms) != TREE_VEC_LENGTH (tmpl_parms))
     {
       cp_error_at ("previous declaration `%D'", 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;
     }