diff options
| author | Jason Merrill <jason@redhat.com> | 2003-03-25 15:30:36 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2003-03-25 15:30:36 -0500 |
| commit | d8c8524d46f795455ce1dadb7d06cc5018c71d56 (patch) | |
| tree | 4e75373d0995d10cb40c5c4d60f210fed2fa8708 /gcc | |
| parent | 2e2255ffff45da118ea54715fbe880624f29b9cf (diff) | |
| download | gcc-d8c8524d46f795455ce1dadb7d06cc5018c71d56.zip gcc-d8c8524d46f795455ce1dadb7d06cc5018c71d56.tar.gz gcc-d8c8524d46f795455ce1dadb7d06cc5018c71d56.tar.bz2 | |
call.c (print_z_candidate): Change name of first arg to msgid.
* call.c (print_z_candidate): Change name of first arg to msgid.
(joust): Add comment for translators.
From-SVN: r64864
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b2d4f79..1fe0268 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2003-03-25 Jason Merrill <jason@redhat.com> + + * call.c (print_z_candidate): Change name of first arg to msgid. + (joust): Add comment for translators. + 2003-03-24 Nathan Sidwell <nathan@codesourcery.com> PR c++/9898, PR c++/383, DR 322 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 3d8e17f..101b341 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -56,6 +56,8 @@ static void op_error (enum tree_code, enum tree_code, tree, tree, static tree build_object_call (tree, tree); static tree resolve_args (tree); static struct z_candidate *build_user_type_conversion_1 (tree, tree, int); +static void print_z_candidate (const char *msgid, struct z_candidate *, + void (*)(const char *, ...)); static void print_z_candidates (struct z_candidate *); static tree build_this (tree); static struct z_candidate *splice_viable (struct z_candidate *, bool, bool *); @@ -2440,28 +2442,28 @@ equal_functions (tree fn1, tree fn2) (i.e. error, warning or pedwarn) used to do the printing. */ static void -print_z_candidate (const char *str, struct z_candidate *candidate, +print_z_candidate (const char *msgid, struct z_candidate *candidate, void (*errfn)(const char *, ...)) { if (TREE_CODE (candidate->fn) == IDENTIFIER_NODE) { if (TREE_VEC_LENGTH (candidate->convs) == 3) - errfn ("%s %D(%T, %T, %T) <built-in>", str, candidate->fn, + errfn ("%s %D(%T, %T, %T) <built-in>", msgid, candidate->fn, TREE_TYPE (TREE_VEC_ELT (candidate->convs, 0)), TREE_TYPE (TREE_VEC_ELT (candidate->convs, 1)), TREE_TYPE (TREE_VEC_ELT (candidate->convs, 2))); else if (TREE_VEC_LENGTH (candidate->convs) == 2) - errfn ("%s %D(%T, %T) <built-in>", str, candidate->fn, + errfn ("%s %D(%T, %T) <built-in>", msgid, candidate->fn, TREE_TYPE (TREE_VEC_ELT (candidate->convs, 0)), TREE_TYPE (TREE_VEC_ELT (candidate->convs, 1))); else - errfn ("%s %D(%T) <built-in>", str, candidate->fn, + errfn ("%s %D(%T) <built-in>", msgid, candidate->fn, TREE_TYPE (TREE_VEC_ELT (candidate->convs, 0))); } else if (TYPE_P (candidate->fn)) - errfn ("%s %T <conversion>", str, candidate->fn); + errfn ("%s %T <conversion>", msgid, candidate->fn); else - errfn ("%H%s %+#D%s", &DECL_SOURCE_LOCATION (candidate->fn), str, + errfn ("%H%s %+#D%s", &DECL_SOURCE_LOCATION (candidate->fn), msgid, candidate->fn, candidate->viable == -1 ? " <near match>" : ""); } @@ -5873,6 +5875,8 @@ tweak: if (warn) { print_z_candidate ("ISO C++ says that ", w, pedwarn); + /* Translators note: This message is a continuation of the + previous one, aligned on the right. */ print_z_candidate (" and ", l, pedwarn); pedwarn ("are ambiguous even though the worst conversion \ for the former is better than the worst conversion for the latter"); |