aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Mueller <dmueller@suse.de>2006-10-30 23:32:29 +0000
committerDirk Mueller <mueller@gcc.gnu.org>2006-10-30 23:32:29 +0000
commitebbc3ce18e8c7741d76701cdef8d33453906a7fd (patch)
tree3f5d5fd832c16712d20ac6c16a92aeb5e02f4815
parent8975fa18ad8ef52774073462dfc7698f06cf591e (diff)
downloadgcc-ebbc3ce18e8c7741d76701cdef8d33453906a7fd.zip
gcc-ebbc3ce18e8c7741d76701cdef8d33453906a7fd.tar.gz
gcc-ebbc3ce18e8c7741d76701cdef8d33453906a7fd.tar.bz2
re PR c++/28704 (%s substituted with "static member"/"free" can't be properly translated)
2006-10-30 Dirk Mueller <dmueller@suse.de> PR c++/28704 * decl.c (grokdeclarator): Duplicate diagnostic message for easier translation. From-SVN: r118208
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/decl.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ad1f126..7db62ec 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
2006-10-30 Dirk Mueller <dmueller@suse.de>
+ PR c++/28704
+ * decl.c (grokdeclarator): Duplicate diagnostic message
+ for easier translation.
+
+2006-10-30 Dirk Mueller <dmueller@suse.de>
+
PR c++/6321
* decl.c (grokfndecl): Use check_main_parameter_types.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 846089b..67a1352 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8039,8 +8039,9 @@ grokdeclarator (const cp_declarator *declarator,
if (cp_type_quals (type) != TYPE_UNQUALIFIED
&& (current_class_type == NULL_TREE || staticp) )
{
- error ("qualified function types cannot be used to declare %s functions",
- (staticp? "static member" : "free"));
+ error (staticp
+ ? G_("qualified function types cannot be used to declare static member functions")
+ : G_("qualified function types cannot be used to declare free functions"));
type = TYPE_MAIN_VARIANT (type);
}