diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2010-12-18 19:58:57 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2010-12-18 19:58:57 +0000 |
| commit | d0a64ec1557ed20bfedce2f48cfab9c62e319098 (patch) | |
| tree | 7ef0104a66fd48d30e53c1672fc785d2af108f2e | |
| parent | 81fada9aa760fe9e502fbc0ad0e4bf94ecd1269f (diff) | |
| download | gcc-d0a64ec1557ed20bfedce2f48cfab9c62e319098.zip gcc-d0a64ec1557ed20bfedce2f48cfab9c62e319098.tar.gz gcc-d0a64ec1557ed20bfedce2f48cfab9c62e319098.tar.bz2 | |
pt.c (most_specialized_class): Use ngettext to determine "candidates are:" / "candidate is" message.
* pt.c (most_specialized_class): Use ngettext to determine
"candidates are:" / "candidate is" message.
From-SVN: r168029
| -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)); |