From: Volker Reichelt <v.reichelt@netcologne.de>
Date: Mon, 27 Feb 2017 13:29:35 +0000 (+0000)
Subject: init.c: Include intl.h.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=24f12823837aa38026253675c822f219a3a34c13;p=gcc.git

init.c: Include intl.h.

2017-02-27  Volker Reichelt  <v.reichelt@netcologne.de>

       * init.c: Include intl.h.
       (build_new_1): Move message strings into pedwarn to make them
       -Wformat-security friendly. Mark string for translation.
       * pt.c (tsubst_copy_and_build): Mark string for translation.
       Make the pointer const.
       * semantics.c (finish_id_expression): Mark strings for
       * translation.

From-SVN: r245757
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 03b79f1355e..b2459ce2eb5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2017-02-27  Volker Reichelt  <v.reichelt@netcologne.de>
+
+	* init.c: Include intl.h.
+	(build_new_1): Move message strings into pedwarn to make them
+	-Wformat-security friendly. Mark string for translation.
+	* pt.c (tsubst_copy_and_build): Mark string for translation.
+	Make the pointer const.
+	* semantics.c (finish_id_expression): Mark strings for translation.
+
 2017-02-25  Jakub Jelinek  <jakub@redhat.com>
 
 	* call.c (build_op_delete_call): Make msg1 and msg2 const.
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 13ade8a616b..b8308227988 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "varasm.h"
 #include "gimplify.h"
 #include "c-family/c-ubsan.h"
+#include "intl.h"
 
 static bool begin_init_stmts (tree *, tree *);
 static tree finish_init_stmts (bool, tree, tree);
@@ -2803,15 +2804,12 @@ build_new_1 (vec<tree, va_gc> **placement, tree type, tree nelts,
     {
       if (complain & tf_warning_or_error)
 	{
-	  const char *msg;
-	  if (typedef_variant_p (orig_type))
-	    msg = ("non-constant array new length must be specified "
-		   "directly, not by typedef");
-	  else
-	    msg = ("non-constant array new length must be specified "
-		   "without parentheses around the type-id");
-	  pedwarn (EXPR_LOC_OR_LOC (outer_nelts, input_location),
-		   OPT_Wvla, msg);
+	  pedwarn (EXPR_LOC_OR_LOC (outer_nelts, input_location), OPT_Wvla,
+		   typedef_variant_p (orig_type)
+		   ? "non-constant array new length must be specified "
+		     "directly, not by typedef"
+		   : G_("non-constant array new length must be specified "
+			"without parentheses around the type-id"));
 	}
       else
 	return error_mark_node;
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index aaca70fe436..d5428ed9feb 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -17190,10 +17190,11 @@ tsubst_copy_and_build (tree t,
 		       stricter.  */
 		    bool in_lambda = (current_class_type
 				      && LAMBDA_TYPE_P (current_class_type));
-		    char const *msg = "%qD was not declared in this scope, "
-		      "and no declarations were found by "
-		      "argument-dependent lookup at the point "
-		      "of instantiation";
+		    char const *const msg
+		      = G_("%qD was not declared in this scope, "
+			   "and no declarations were found by "
+			   "argument-dependent lookup at the point "
+			   "of instantiation");
 
 		    bool diag = true;
 		    if (in_lambda)
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 67f8b9264f1..bcfdd668c3a 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -3510,7 +3510,7 @@ finish_id_expression (tree id_expression,
 	  && DECL_CONTEXT (decl) == NULL_TREE
 	  && !cp_unevaluated_operand)
 	{
-	  *error_msg = "use of parameter outside function body";
+	  *error_msg = G_("use of parameter outside function body");
 	  return error_mark_node;
 	}
     }
@@ -3520,13 +3520,13 @@ finish_id_expression (tree id_expression,
   if (TREE_CODE (decl) == TEMPLATE_DECL
       && !DECL_FUNCTION_TEMPLATE_P (decl))
     {
-      *error_msg = "missing template arguments";
+      *error_msg = G_("missing template arguments");
       return error_mark_node;
     }
   else if (TREE_CODE (decl) == TYPE_DECL
 	   || TREE_CODE (decl) == NAMESPACE_DECL)
     {
-      *error_msg = "expected primary-expression";
+      *error_msg = G_("expected primary-expression");
       return error_mark_node;
     }