* pt.c (fold_non_dependent_expr_sfinae): Split out from...
	(fold_non_dependent_expr): ...here.
	(convert_nontype_argument): Use it.  Take complain parm.
	Use perform_implicit_conversion	instead of ocp_convert.
	Allow cv-qual changes.
	(convert_template_argument): Pass complain down.
	(tsubst_template_arg): Suppress constant expression warnings.
	Don't fold here.

From-SVN: r163895