diff options
| author | Jason Merrill <jason@redhat.com> | 2011-03-31 16:28:31 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-03-31 16:28:31 -0400 |
| commit | 4e36c2131fcffc92881baa8dca67c868574bfacb (patch) | |
| tree | e19131d84408420d503000791293a1422e69553a /gcc | |
| parent | b8faca75e7b2a0c0a0b4185be32432e578c2b945 (diff) | |
| download | gcc-4e36c2131fcffc92881baa8dca67c868574bfacb.zip gcc-4e36c2131fcffc92881baa8dca67c868574bfacb.tar.gz gcc-4e36c2131fcffc92881baa8dca67c868574bfacb.tar.bz2 | |
parser.c (cp_parser_init_declarator): Avoid redundant cp_finish_decl for member declarations.
* parser.c (cp_parser_init_declarator): Avoid redundant
cp_finish_decl for member declarations.
From-SVN: r171796
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5844215..c2f9831 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-03-31 Jason Merrill <jason@redhat.com> + + * parser.c (cp_parser_init_declarator): Avoid redundant + cp_finish_decl for member declarations. + 2011-03-30 Jason Merrill <jason@redhat.com> PR c++/48212 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 3a60d0f..9ed3a1f 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -14501,9 +14501,9 @@ cp_parser_init_declarator (cp_parser* parser, cp_parser_save_default_args (parser, decl); } - /* Finish processing the declaration. But, skip friend + /* Finish processing the declaration. But, skip member declarations. */ - if (!friend_p && decl && decl != error_mark_node && !range_for_decl_p) + if (!member_p && decl && decl != error_mark_node && !range_for_decl_p) { cp_finish_decl (decl, initializer, !is_non_constant_init, |