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

[jason@gcc.gnu.org]

Author: jason
Date: Fri May  9 18:15:46 2014
New Revision: 210281

URL: http://gcc.gnu.org/viewcvs?rev=210281&root=gcc&view=rev
Log:
	PR c++/22434
	* call.c (build_conditional_expr_1): Don't try to pool cv-quals
	if we didn't find a conversion.
	Don't accept a bad conversion too early.

Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/call.c
    trunk/gcc/testsuite/g++.dg/expr/cond8.C
    trunk/gcc/testsuite/g++.old-deja/g++.jason/conversion10.C