From 9ee5ebeb8d7d072fa161be010d5bd8b3dab06197 Mon Sep 17 00:00:00 2001 From: Shujing Zhao Date: Fri, 29 Jan 2010 03:28:50 +0000 Subject: [PATCH] decl.c (redeclaration_error_message): Wrap the return messages to G_() for easy translation. 2010-01-29 Shujing Zhao * decl.c (redeclaration_error_message): Wrap the return messages to G_() for easy translation. From-SVN: r156340 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 41 +++++++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c104e864eb7..45b5c344a60 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-01-29 Shujing Zhao + + * decl.c (redeclaration_error_message): Wrap the return messages into + G_() for easy translation. + 2010-01-28 Jason Merrill PR c++/42880 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 920d75b75a8..db3d7054dc1 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2210,7 +2210,7 @@ redeclaration_error_message (tree newdecl, tree olddecl) if (same_type_p (TREE_TYPE (newdecl), TREE_TYPE (olddecl))) return NULL; else - return "redefinition of %q#D"; + return G_("redefinition of %q#D"); } else if (TREE_CODE (newdecl) == FUNCTION_DECL) { @@ -2226,7 +2226,7 @@ redeclaration_error_message (tree newdecl, tree olddecl) if (DECL_NAMESPACE_SCOPE_P (olddecl) && DECL_CONTEXT (olddecl) != DECL_CONTEXT (newdecl) && ! decls_match (olddecl, newdecl)) - return "%qD conflicts with used function"; + return G_("%qD conflicts with used function"); /* We'll complain about linkage mismatches in warn_extern_redeclared_static. */ @@ -2236,10 +2236,10 @@ redeclaration_error_message (tree newdecl, tree olddecl) && DECL_INITIAL (newdecl) != NULL_TREE) { if (DECL_NAME (olddecl) == NULL_TREE) - return "%q#D not declared in class"; + return G_("%q#D not declared in class"); else if (!GNU_INLINE_P (olddecl) || GNU_INLINE_P (newdecl)) - return "redefinition of %q#D"; + return G_("redefinition of %q#D"); } if (DECL_DECLARED_INLINE_P (olddecl) && DECL_DECLARED_INLINE_P (newdecl)) @@ -2250,9 +2250,11 @@ redeclaration_error_message (tree newdecl, tree olddecl) if (olda != newa) { if (newa) - return "%q+D redeclared inline with % attribute"; + return G_("%q+D redeclared inline with " + "% attribute"); else - return "%q+D redeclared inline without % attribute"; + return G_("%q+D redeclared inline without " + "% attribute"); } } @@ -2266,7 +2268,7 @@ redeclaration_error_message (tree newdecl, tree olddecl) { if (COMPLETE_TYPE_P (TREE_TYPE (newdecl)) && COMPLETE_TYPE_P (TREE_TYPE (olddecl))) - return "redefinition of %q#D"; + return G_("redefinition of %q#D"); return NULL; } @@ -2283,7 +2285,7 @@ redeclaration_error_message (tree newdecl, tree olddecl) ot = DECL_TEMPLATE_RESULT (template_for_substitution (ot)); if (DECL_INITIAL (nt) && DECL_INITIAL (ot) && (!GNU_INLINE_P (ot) || GNU_INLINE_P (nt))) - return "redefinition of %q#D"; + return G_("redefinition of %q#D"); if (DECL_DECLARED_INLINE_P (ot) && DECL_DECLARED_INLINE_P (nt)) { @@ -2293,9 +2295,11 @@ redeclaration_error_message (tree newdecl, tree olddecl) if (olda != newa) { if (newa) - return "%q+D redeclared inline with % attribute"; + return G_("%q+D redeclared inline with " + "% attribute"); else - return "%q+D redeclared inline without % attribute"; + return G_("%q+D redeclared inline without " + "% attribute"); } } @@ -2310,7 +2314,8 @@ redeclaration_error_message (tree newdecl, tree olddecl) && !check_default_tmpl_args (nt, DECL_TEMPLATE_PARMS (newdecl), /*is_primary=*/1, /*is_partial=*/0, /*is_friend_decl=*/2)) - return "redeclaration of friend %q#D may not have default template arguments"; + return G_("redeclaration of friend %q#D " + "may not have default template arguments"); return NULL; } @@ -2323,11 +2328,11 @@ redeclaration_error_message (tree newdecl, tree olddecl) /* Only variables can be thread-local, and all declarations must agree on this property. */ if (DECL_THREAD_LOCAL_P (newdecl)) - return "thread-local declaration of %q#D follows " - "non-thread-local declaration"; + return G_("thread-local declaration of %q#D follows " + "non-thread-local declaration"); else - return "non-thread-local declaration of %q#D follows " - "thread-local declaration"; + return G_("non-thread-local declaration of %q#D follows " + "thread-local declaration"); } else if (toplevel_bindings_p () || DECL_NAMESPACE_SCOPE_P (newdecl)) { @@ -2341,7 +2346,7 @@ redeclaration_error_message (tree newdecl, tree olddecl) is invalid. */ if ((TREE_CODE (newdecl) == VAR_DECL && DECL_ANON_UNION_VAR_P (newdecl)) || (TREE_CODE (olddecl) == VAR_DECL && DECL_ANON_UNION_VAR_P (olddecl))) - return "redeclaration of %q#D"; + return G_("redeclaration of %q#D"); /* If at least one declaration is a reference, there is no conflict. For example: @@ -2352,7 +2357,7 @@ redeclaration_error_message (tree newdecl, tree olddecl) if (DECL_EXTERNAL (newdecl) || DECL_EXTERNAL (olddecl)) return NULL; /* Reject two definitions. */ - return "redefinition of %q#D"; + return G_("redefinition of %q#D"); } else { @@ -2360,7 +2365,7 @@ redeclaration_error_message (tree newdecl, tree olddecl) /* Reject two definitions, and reject a definition together with an external reference. */ if (!(DECL_EXTERNAL (newdecl) && DECL_EXTERNAL (olddecl))) - return "redeclaration of %q#D"; + return G_("redeclaration of %q#D"); return NULL; } } -- 2.30.2