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

Thu Nov 10 20:28:00 GMT 2011

Author: jason
Date: Thu Nov 10 20:28:16 2011
New Revision: 181270

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=181270
Log:
	PR c++/51079, DR 495
	* call.c (joust): Check the second conversion sequence
	before checking templates.

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