diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 6 | ||||
| -rw-r--r-- | gcc/cp/parse.y | 8 |
3 files changed, 12 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 81ff7e6..0ae391e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-05-27 Jason Merrill <jason@redhat.com> + + * decl.c (current_binding_level): Add *&. + * parse.y (constructor_declarator): Fix for bison pedantry. + 2003-04-22 Release Manager * GCC 3.2.3 Released. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 82ea227..1093302 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -454,9 +454,9 @@ struct binding_level /* The binding level currently in effect. */ #define current_binding_level \ - (cfun && cp_function_chain->bindings \ - ? cp_function_chain->bindings \ - : scope_chain->bindings) + (*(cfun && cp_function_chain->bindings \ + ? &cp_function_chain->bindings \ + : &scope_chain->bindings)) /* The binding level of the current class, if any. */ diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y index e929ebe..5c69c58 100644 --- a/gcc/cp/parse.y +++ b/gcc/cp/parse.y @@ -799,7 +799,7 @@ fndef: constructor_declarator: nested_name_specifier SELFNAME '(' - { $$ = begin_constructor_declarator ($1, $2); } + { $<ttype>$ = begin_constructor_declarator ($1, $2); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($<ttype>4, $5, $7, $8); } | nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt @@ -807,7 +807,7 @@ constructor_declarator: $$ = make_call_declarator ($$, empty_parms (), $4, $5); } | global_scope nested_name_specifier SELFNAME '(' - { $$ = begin_constructor_declarator ($2, $3); } + { $<ttype>$ = begin_constructor_declarator ($2, $3); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($<ttype>5, $6, $8, $9); } | global_scope nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt @@ -815,7 +815,7 @@ constructor_declarator: $$ = make_call_declarator ($$, empty_parms (), $5, $6); } | nested_name_specifier self_template_type '(' - { $$ = begin_constructor_declarator ($1, $2); } + { $<ttype>$ = begin_constructor_declarator ($1, $2); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($<ttype>4, $5, $7, $8); } | nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt @@ -823,7 +823,7 @@ constructor_declarator: $$ = make_call_declarator ($$, empty_parms (), $4, $5); } | global_scope nested_name_specifier self_template_type '(' - { $$ = begin_constructor_declarator ($2, $3); } + { $<ttype>$ = begin_constructor_declarator ($2, $3); } parmlist ')' cv_qualifiers exception_specification_opt { $$ = make_call_declarator ($<ttype>5, $6, $8, $9); } | global_scope nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt |