From 71671f4e0b9db5a864d5d5eb65e40618102a4210 Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Thu, 26 May 2005 16:13:40 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/pt.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a40a0349ec7a..55f3c46f788e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2005-05-26 Volker Reichelt + + 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 e5aadc127498..d97b75072f65 100644 --- 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; } -- 2.47.2