cp:
	PR c++/21799
	* pt.c (type_unification_real): Add is_method argument.  Use it
	for this pointer unification.
	(fn_type_unification): Adjust type_unification_real call.
	(unify): Likewise.
testsuite:
	PR c++/21799
	* g++.dg/template/unify8.C: New.
	* g++.dg/template/unify9.C: New.

From-SVN: r101760