diff options
| author | Volker Reichelt <reichelt@igpm.rwth-aachen.de> | 2005-05-26 16:04:37 +0000 |
|---|---|---|
| committer | Volker Reichelt <reichelt@gcc.gnu.org> | 2005-05-26 16:04:37 +0000 |
| commit | f49d8c52bb6cd2fd24f6d7bb9aeb64187ad08ed0 (patch) | |
| tree | 48126465dea3e2e6b20c5c0250fc9662fad4664e | |
| parent | 10d877a8ed148010bab7bb8d669c6e21665a531a (diff) | |
| download | gcc-f49d8c52bb6cd2fd24f6d7bb9aeb64187ad08ed0.zip gcc-f49d8c52bb6cd2fd24f6d7bb9aeb64187ad08ed0.tar.gz gcc-f49d8c52bb6cd2fd24f6d7bb9aeb64187ad08ed0.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bb4b662..1fde495 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 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> diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 1a1d5c0..dd18567 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; } |