r208625 - in /trunk/gcc: cp/ChangeLog cp/parser...

[abutcher@gcc.gnu.org]

Author: abutcher
Date: Mon Mar 17 20:02:26 2014
New Revision: 208625

URL: http://gcc.gnu.org/viewcvs?rev=208625&root=gcc&view=rev
Log:
Fix PR c++/60390

	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 class being defined in order to inject a template argument
	list.

	PR c++/60390
	* g++.dg/cpp1y/pr60390.C: New testcase.

Added:
    trunk/gcc/testsuite/g++.dg/cpp1y/pr60390.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/parser.c
    trunk/gcc/testsuite/ChangeLog