pt.c: add missing %< and %>

gcc/cp/ChangeLog:
	* pt.c (listify): Use %< and %> for description of #include.

gcc/testsuite/ChangeLog:
	* g++.dg/cpp0x/auto21.C: Update dg-error to reflect addition of
	quotes.
	* g++.dg/cpp0x/missing-initializer_list-include.C: Likewise.

From-SVN: r254281

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4b92622d027c28a8d039e5c098491ded102488b0..00ac5938ee16af324dffe247bc1cb06935b18b1e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2017-10-31  David Malcolm  <dmalcolm@redhat.com>
+
+       * pt.c (listify): Use %< and %> for description of #include.
+
 2017-10-31  David Malcolm  <dmalcolm@redhat.com>
 
        * class.c (explain_non_literal_class): Use UNKNOWN_LOCATION rather

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index f525d2233cc41d0f54c400fa0c1aabce2c30655c..629b2dd50ef1f91035aa05ace5501015b90a813b 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -25132,7 +25132,7 @@ listify (tree arg)
       maybe_add_include_fixit (&richloc, "<initializer_list>");
       error_at (&richloc,
                "deducing from brace-enclosed initializer list"
-               " requires #include <initializer_list>");
+               " requires %<#include <initializer_list>%>");
 
       return error_mark_node;
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 42e634dbcc46361211e5b4572a9dde325ce9fc88..196c7a1f4f29a5be4eb3035099a2e7233771afce 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-31  David Malcolm  <dmalcolm@redhat.com>
+
+       * g++.dg/cpp0x/auto21.C: Update dg-error to reflect addition of
+       quotes.
+       * g++.dg/cpp0x/missing-initializer_list-include.C: Likewise.
+
 2017-10-31  David Malcolm  <dmalcolm@redhat.com>
 
        * gcc.dg/plugin/diagnostic_plugin_show_trees.c (show_tree): Update

diff --git a/gcc/testsuite/g++.dg/cpp0x/auto21.C b/gcc/testsuite/g++.dg/cpp0x/auto21.C
index a827b3df85370719e77715ce90b4cba307f327ab..346e98c254e633ee7894c7a0cabf902559663f06 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/auto21.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto21.C
@@ -1,5 +1,5 @@
 // Origin PR c++/47208
 // { dg-do compile { target c++11 } }
 
-constexpr auto list = { }; // { dg-error "deducing from brace-enclosed initializer list requires #include <initializer_list>" }
+constexpr auto list = { }; // { dg-error "deducing from brace-enclosed initializer list requires '#include <initializer_list>'" }
 static const int l = list.size();

diff --git a/gcc/testsuite/g++.dg/cpp0x/missing-initializer_list-include.C b/gcc/testsuite/g++.dg/cpp0x/missing-initializer_list-include.C
index 8e803c82f24463c970a211ce9c743d0d445b1ee6..7d72ec45de47173544d2d6e1b20e2021c49f4f77 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/missing-initializer_list-include.C
+++ b/gcc/testsuite/g++.dg/cpp0x/missing-initializer_list-include.C
@@ -7,7 +7,7 @@
 
 void test (int i)
 {
-  auto a = { &i }; // { dg-error "deducing from brace-enclosed initializer list requires #include <initializer_list>" }
+  auto a = { &i }; // { dg-error "deducing from brace-enclosed initializer list requires '#include <initializer_list>'" }
 }
 
 /* Verify the output from -fdiagnostics-generate-patch.