re PR c++/28669 (%s substituted with static/non- can't be properly translated)

2006-10-30  Dirk Mueller  <dmueller@suse.de>

       PR c++/28669
       * decl.c (grokfndecl): Duplicate warning message for
       easier translation.

From-SVN: r118205

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fe1460e52bd4a3f36d3d835022139d27485b9bd8..b705968d04caff0226e6f1bf987f34111b17f509 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-30  Dirk Mueller  <dmueller@suse.de>
+
+       PR c++/28669
+       * decl.c (grokfndecl): Duplicate warning message for
+       easier translation.
+
 2006-10-30  Dirk Mueller  <dmueller@suse.de>
 
        * typeck.c (build_unary_op): Fix indenting. Use G_().

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 51a1bc9659eb13f98e28088315d74c8fc33b59d8..2645da28295a2d327c5046d9cccbb9a5f7ef78a4 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -48,6 +48,7 @@ Boston, MA 02110-1301, USA.  */
 #include "c-common.h"
 #include "c-pragma.h"
 #include "diagnostic.h"
+#include "intl.h"
 #include "debug.h"
 #include "timevar.h"
 #include "tree-flow.h"
@@ -6085,8 +6086,10 @@ grokfndecl (tree ctype,
   DECL_EXTERNAL (decl) = 1;
   if (quals && TREE_CODE (type) == FUNCTION_TYPE)
     {
-      error ("%smember function %qD cannot have cv-qualifier",
-            (ctype ? "static " : "non-"), decl);
+      error (ctype
+             ? G_("static member function %qD cannot have cv-qualifier")
+             : G_("non-static member function %qD cannot have cv-qualifier"),
+            decl);
       quals = TYPE_UNQUALIFIED;
     }