From f49d8c52bb6cd2fd24f6d7bb9aeb64187ad08ed0 Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Thu, 26 May 2005 16:04:37 +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: r100206 --- 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 bb4b6624df1..1fde4951d7e 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-26 Volker Reichelt * call.c (build_op_delete_call): Fix quoting in error message. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 1a1d5c0f237..dd18567d641 100644 --- 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; } -- 2.30.2