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

[abutcher@gcc.gnu.org]

Author: abutcher
Date: Fri Feb 21 07:47:55 2014
New Revision: 207980

URL: http://gcc.gnu.org/viewcvs?rev=207980&root=gcc&view=rev
Log:
Fix PR c++/60052 and PR c++/60053.

	PR c++/60052
	PR c++/60053
	* parser.c (cp_parser_parameter_declaration_list): Correctly reset
	implicit_template_scope upon leaving an out-of-line generic member
	function definition.

	PR c++/60052
	PR c++/60053
	* g++.dg/cpp1y/pr60052.C: New testcase.
	* g++.dg/cpp1y/pr60053.C: New testcase.

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