re PR c/84910 (typo: "%qs follows inline declaration ")

	PR c/84910
	* c-warn.c (diagnose_mismatched_attributes): Remove trailing space from
	diagnostics.

	* parser.c (cp_parser_lambda_introducer): Remove trailing space from
	diagnostics.
	* method.c (synthesize_method): Likewise.
	* pt.c (convert_nontype_argument): Likewise.

From-SVN: r258608

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index a54d44eb6f3a1af123b31937420b557e9c1faff7..38dbbe377169d2aca2f6921c006d2244346cced1 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-16  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/84910
+       * c-warn.c (diagnose_mismatched_attributes): Remove trailing space from
+       diagnostics.
+
 2018-03-16  Richard Biener  <rguenther@suse.de>
 
        PR c/84873

diff --git a/gcc/c-family/c-warn.c b/gcc/c-family/c-warn.c
index 51c376b7c37fdda2671e831da97df03a823789a0..7672d534ffc888ad54db21a53eed2c0b279b181d 100644 (file)
--- a/gcc/c-family/c-warn.c
+++ b/gcc/c-family/c-warn.c
@@ -2258,7 +2258,7 @@ diagnose_mismatched_attributes (tree olddecl, tree newdecl)
           && DECL_UNINLINABLE (newdecl)
           && lookup_attribute ("noinline", DECL_ATTRIBUTES (newdecl)))
     warned |= warning (OPT_Wattributes, "declaration of %q+D with attribute "
-                      "%qs follows inline declaration ", newdecl, noinline);
+                      "%qs follows inline declaration", newdecl, noinline);
 
   return warned;
 }

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fe7b32e67550f747abfdae3063a850d36ba6d386..2a8da084445416a3f33254758a4afbb820fb1bf6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2018-03-16  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/84910
+       * parser.c (cp_parser_lambda_introducer): Remove trailing space from
+       diagnostics.
+       * method.c (synthesize_method): Likewise.
+       * pt.c (convert_nontype_argument): Likewise.
+
 2018-03-16  Jason Merrill  <jason@redhat.com>
 
        PR c++/84720 - ICE with rvalue ref non-type argument.

diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 33029d7967e6e658df3e5319b23d020838f4c562..83fed6c86691fd5a7d6d8bbab4769b9447a8aa98 100644 (file)
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -950,7 +950,7 @@ synthesize_method (tree fndecl)
   pop_deferring_access_checks ();
 
   if (error_count != errorcount || warning_count != warningcount + werrorcount)
-    inform (input_location, "synthesized method %qD first required here ",
+    inform (input_location, "synthesized method %qD first required here",
            fndecl);
 }
 

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 119f6c078f73e14573b51f3c62c8f9f55a40921f..c8a0e77aec6146c8f16fc8df66981ada7f241c9b 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -10383,7 +10383,7 @@ cp_parser_lambda_introducer (cp_parser* parser, tree lambda_expr)
                   && TREE_CODE (capture_init_expr) != PARM_DECL)
            {
              error_at (capture_token->location,
-                       "capture of non-variable %qE ",
+                       "capture of non-variable %qE",
                        capture_init_expr);
              if (DECL_P (capture_init_expr))
                inform (DECL_SOURCE_LOCATION (capture_init_expr),

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index f7b1b0dd9aadf7e640cf54823b540c8cfba1101e..745c9acd6eec6ddafe420156cb37c337666afa5e 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6753,7 +6753,7 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
              else
                expr = cxx_constant_value (expr);
              if (errorcount > errs || warningcount + werrorcount > warns)
-               inform (loc, "in template argument for type %qT ", type);
+               inform (loc, "in template argument for type %qT", type);
              if (expr == error_mark_node)
                return NULL_TREE;
              /* else cxx_constant_value complained but gave us