r207281 - in /trunk/gcc: cp/ChangeLog cp/friend...

[jason@gcc.gnu.org]

Author: jason
Date: Wed Jan 29 20:44:50 2014
New Revision: 207281

URL: http://gcc.gnu.org/viewcvs?rev=207281&root=gcc&view=rev
Log:
	PR c++/59956
	* friend.c (do_friend): Pass the TEMPLATE_DECL to add_friend if we
	have a friend template in a class template.
	* pt.c (tsubst_friend_function): Look through it.
	(push_template_decl_real): A friend member template is
	primary.

Added:
    trunk/gcc/testsuite/g++.dg/template/friend55.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/friend.c
    trunk/gcc/cp/pt.c