diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2017-10-31 20:30:51 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2017-10-31 20:30:51 +0000 |
| commit | 84ffba1283c323e559d487f5a44012e2481f7c85 (patch) | |
| tree | 98282f75b95859dfe915f1fe28fbf243d5c41a9b | |
| parent | 64a5912c9ee9aac3d0b1583924a69f74022a989a (diff) | |
| download | gcc-84ffba1283c323e559d487f5a44012e2481f7c85.zip gcc-84ffba1283c323e559d487f5a44012e2481f7c85.tar.gz gcc-84ffba1283c323e559d487f5a44012e2481f7c85.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/auto21.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/missing-initializer_list-include.C | 2 |
5 files changed, 13 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4b92622..00ac593 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 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 than 0. * name-lookup.c (suggest_alternatives_for): Update for renaming of diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index f525d22..629b2dd 100644 --- 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 42e634d..196c7a1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,11 @@ 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 for renaming of error_at_rich_loc and inform_at_rich_loc. * gcc.dg/plugin/diagnostic_plugin_test_show_locus.c diff --git a/gcc/testsuite/g++.dg/cpp0x/auto21.C b/gcc/testsuite/g++.dg/cpp0x/auto21.C index a827b3d..346e98c 100644 --- 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 8e803c8..7d72ec4 100644 --- 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. |