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

[abutcher@gcc.gnu.org]

Author: abutcher
Date: Mon Mar 17 20:02:16 2014
New Revision: 208624

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

	PR c++/60391
	* parser.c (cp_parser_skip_to_end_of_block_or_statement): Unwind generic
	function scope as per cp_parser_skip_to_end_of_statement.

	PR c++/60391
	* g++.dg/cpp1y/pr60391.C: New testcase.

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