diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b2a9587..8ac637a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-12-18 Joseph Myers <joseph@codesourcery.com> + + * pt.c (most_specialized_class): Use ngettext to determine + "candidates are:" / "candidate is" message. + 2010-12-17 Jason Merrill <jason@redhat.com> PR c++/46670 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 49016b3..c76d381 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -16512,7 +16512,7 @@ most_specialized_class (tree type, tree tmpl, tsubst_flags_t complain) if (!(complain & tf_error)) return error_mark_node; error ("ambiguous class template instantiation for %q#T", type); - str = TREE_CHAIN (list) ? _("candidates are:") : _("candidate is:"); + str = ngettext ("candidate is:", "candidates are:", list_length (list)); for (t = list; t; t = TREE_CHAIN (t)) { error ("%s %+#T", spaces ? spaces : str, TREE_TYPE (t)); |