Re: [PATCH 1/2] Fix PR c++/60065.

2014-02-24 Thread Jason Merrill
On 02/24/2014 03:05 PM, Adam Butcher wrote: On 2014-02-24 18:16, Jason Merrill wrote: On 02/24/2014 02:32 AM, Adam Butcher wrote: +static bool function_being_declared_is_template_p (cp_parser* parser) Function name should be at the beginning of the next line. Doh! Fixed. OK with that fix

Re: [PATCH 1/2] Fix PR c++/60065.

2014-02-24 Thread Adam Butcher
On 2014-02-24 18:16, Jason Merrill wrote: On 02/24/2014 02:32 AM, Adam Butcher wrote: +static bool function_being_declared_is_template_p (cp_parser* parser) Function name should be at the beginning of the next line. Doh! Fixed. - if (scope->kind != sk_template_parms) + if (scope

Re: [PATCH 1/2] Fix PR c++/60065.

2014-02-24 Thread Jason Merrill
On 02/24/2014 02:32 AM, Adam Butcher wrote: +static bool function_being_declared_is_template_p (cp_parser* parser) Function name should be at the beginning of the next line. - if (scope->kind != sk_template_parms) + if (scope->kind != sk_template_parms + || !function_being_d

[PATCH 1/2] Fix PR c++/60065.

2014-02-24 Thread Adam Butcher
PR c++/60065 * parser.c (cp_parser_direct_declarator): Don't save and restore num_template_parameter_lists around call to cp_parser_parameter_declaration_list. (function_being_declared_is_template_p): New predicate. (cp_parser_parameter_declaration_li