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

[abutcher@gcc.gnu.org]

Author: abutcher
Date: Tue Feb 18 22:29:56 2014
New Revision: 207856

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

    PR c++/60064
    * parser.c (cp_parser_member_declaration): Pop fully implicit template
    scope for generic friend declarations as well as for non-friends.

    PR c++/60064
    * g++.dg/cpp1y/pr60064.C: New testcase.

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