From b9af306b979306215b1f999ca2636a0874717c9c Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Fri, 21 Oct 2011 16:31:21 +0300 Subject: [PATCH] re PR c++/50811 ([C++0x] G++ rejects class-virt-specifier if class-head-name includes nested-name-specifier) PR c++/50811 * parser.c (cp_parser_class_head): Parse virt-specifiers regardless of whether an id is present From-SVN: r180301 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/override2.C | 7 +++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index df7e1bcf05c..11994ee4b13 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-10-21 Ville Voutilainen + + PR c++/50811 + * parser.c (cp_parser_class_head): Parse virt-specifiers + regardless of whether an id is present + 2011-10-20 Jason Merrill PR c++/41449 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 8d138fb7b53..a762d9d9184 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 b70d758b6b0..a1b2752c45f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-10-21 Ville Voutilainen + + PR c++/50811 + * g++.dg/cpp0x/override2.C: Add test. + 2011-10-21 Rainer Orth * 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 7f17504fae2..0d8871d6ae2 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 d; -- 2.30.2