PR c++/641, c++/11876

	PR c++/641, c++/11876
	* friend.c (add_friend): Add complain parameter.
	(make_friend_class): Likewise.
	(do_friend): Adjust add_friend call.
	* decl.c (grokdeclarator): Adjust make_friend_class call.
	* parser.c (cp_parser_member_declaration): Likewise.
	(cp_parser_template_declaration_after_exp): Likewise.
	* pt.c (instantiate_class_template): Adjust make_friend_class
	and add_friend call.
	* cp-tree.h (make_friend_class): Adjust declaration.
	(add_friend): Likewise.

	* g++.dg/template/friend22.C: New test.
	* g++.dg/template/friend23.C: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70732 138bc75d-0d04-0410-961f-82ee72b054a4