r178790 - in /trunk/gcc: cp/ChangeLog cp/call.c...

[jason@gcc.gnu.org]

Author: jason
Date: Mon Sep 12 18:04:55 2011
New Revision: 178790

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=178790
Log:
	* call.c (merge_conversion_sequences): Set bad_p and user_conv_p
	on all of the second conversion sequence.
	(build_user_type_conversion_1): Set bad_p on the ck_user conv.
	(convert_like_real): Handle bad ck_ref_bind with user_conv_p in the
	first section.  Fix loop logic.
	(initialize_reference): Call convert_like for diagnostics when
	we have a (bad) conversion.

Added:
    trunk/gcc/testsuite/g++.dg/cpp0x/explicit7.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/call.c
    trunk/gcc/testsuite/ChangeLog