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

[abutcher@gcc.gnu.org]

Author: abutcher
Date: Tue Feb 25 06:44:53 2014
New Revision: 208111

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

	PR c++/60311
	* parser.c (function_being_declared_is_template_p): Return false when
	processing a template parameter list.
	(cp_parser_parameter_declaration_clause): Don't set
	auto_is_implicit_function_template_parm_p when processing a
	template parameter list.

	PR c++/60311
	* g++.dg/cpp1y/pr60311.C: New testcase.

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