diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/override2.C | 7 |
4 files changed, 19 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index df7e1bc..11994ee 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-10-21 Ville Voutilainen <ville.voutilainen@gmail.com> + + PR c++/50811 + * parser.c (cp_parser_class_head): Parse virt-specifiers + regardless of whether an id is present + 2011-10-20 Jason Merrill <jason@redhat.com> PR c++/41449 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 8d138fb..a762d9d 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -17853,8 +17853,8 @@ cp_parser_class_head (cp_parser* parser, { cp_parser_check_for_invalid_template_id (parser, id, type_start_token->location); - virt_specifiers = cp_parser_virt_specifier_seq_opt (parser); } + virt_specifiers = cp_parser_virt_specifier_seq_opt (parser); /* If it's not a `:' or a `{' then we can't really be looking at a class-head, since a class-head only appears as part of a diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b70d758..a1b2752 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-10-21 Ville Voutilainen <ville.voutilainen@gmail.com> + + PR c++/50811 + * g++.dg/cpp0x/override2.C: Add test. + 2011-10-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * lib/gcc-dg.exp (GCC_UNDER_TEST): Set before calling diff --git a/gcc/testsuite/g++.dg/cpp0x/override2.C b/gcc/testsuite/g++.dg/cpp0x/override2.C index 7f17504..0d8871d 100644 --- a/gcc/testsuite/g++.dg/cpp0x/override2.C +++ b/gcc/testsuite/g++.dg/cpp0x/override2.C @@ -28,6 +28,13 @@ struct B6 final final {}; // { dg-error "duplicate virt-specifier" } struct B7 override {}; // { dg-error "cannot specify 'override' for a class" } +namespace N +{ + struct C; +} + +struct N::C final{}; + int main() { D3<B1> d; |