diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index faf73ad..abfc86a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2004-11-24 Mark Mitchell <mark@codesourcery.com> + PR c++/18586 + * parser.c (cp_parser_init_declarator): Do not pop scope twice. + PR c++/18530 * cp-tree.h (CTOR_NAME): Remove. (DTOR_NAME): Remove. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 265abdb..ccd8a95 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -10590,7 +10590,10 @@ cp_parser_init_declarator (cp_parser* parser, if (member_p) { if (pop_p) - pop_scope (scope); + { + pop_scope (scope); + pop_p = false; + } decl = grokfield (declarator, decl_specifiers, initializer, /*asmspec=*/NULL_TREE, /*attributes=*/NULL_TREE); |