diff options
| author | Marek Polacek <polacek@redhat.com> | 2020-08-04 09:35:25 -0400 |
|---|---|---|
| committer | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-17 15:07:35 -0300 |
| commit | 87a3c76d4674c5232acaa27698ce9d6b24566fdd (patch) | |
| tree | 391d8fbe4bb7a21766753e3ea79ef19c999f5c0f | |
| parent | 288794ad8cd55f599f77de67d459e47d748e6825 (diff) | |
| download | gcc-87a3c76d4674c5232acaa27698ce9d6b24566fdd.zip gcc-87a3c76d4674c5232acaa27698ce9d6b24566fdd.tar.gz gcc-87a3c76d4674c5232acaa27698ce9d6b24566fdd.tar.bz2 | |
c++: Template keyword following :: [PR96082]
In r9-4235 I tried to make sure that the template keyword follows
a nested-name-specifier. :: is a valid nested-name-specifier, so
I also have to check 'globalscope' before giving the error.
gcc/cp/ChangeLog:
PR c++/96082
* parser.c (cp_parser_elaborated_type_specifier): Allow
'template' following ::.
gcc/testsuite/ChangeLog:
PR c++/96082
* g++.dg/template/template-keyword3.C: New test.
| -rw-r--r-- | gcc/cp/parser.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/template-keyword3.C | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 1e7cd19..981c625 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -18840,7 +18840,7 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, if (!template_p) cp_parser_parse_tentatively (parser); /* The `template' keyword must follow a nested-name-specifier. */ - else if (!nested_name_specifier) + else if (!nested_name_specifier && !globalscope) { cp_parser_error (parser, "%<template%> must follow a nested-" "name-specifier"); diff --git a/gcc/testsuite/g++.dg/template/template-keyword3.C b/gcc/testsuite/g++.dg/template/template-keyword3.C new file mode 100644 index 0000000..91af2b3 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/template-keyword3.C @@ -0,0 +1,11 @@ +// PR c++/96082 +// { dg-do compile { target c++11 } } + +template <class> class A {}; + +void +f () +{ + typename::template A <int> a; + ::template A <int> a2; +} |