Re: [PATCH] Fix PR c++/60390

2014-03-17 Thread Jason Merrill
On 03/16/2014 04:44 PM, Adam Butcher wrote: + if (parser->num_classes_being_defined == 0) + while (scope->kind == sk_class) + { + parent_scope = scope; + scope = scope->level_chain; + } + else + while (scope->

[PATCH] Fix PR c++/60390

2014-03-16 Thread Adam Butcher
PR c++/60390 * parser.c (cp_parser_member_declaration): Don't allow finish_fully_implicit_template to consider friend declarations to be class member templates. (synthesize_implicit_template_parm): Handling winding back through class scope to the clas