r179815 - in /branches/gcc-4_6-branch/gcc: cp/C...

[jason@gcc.gnu.org]

Author: jason
Date: Tue Oct 11 18:18:25 2011
New Revision: 179815

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=179815
Log:
	PR c++/49855
	PR c++/49896
	* call.c (perform_implicit_conversion_flags): Do perform
	scalar conversions in templates.
	* pt.c (tsubst_copy, tsubst_copy_and_build): Handle CONVERT_EXPR.

Added:
    branches/gcc-4_6-branch/gcc/testsuite/g++.dg/template/constant1.C
    branches/gcc-4_6-branch/gcc/testsuite/g++.dg/template/constant2.C
Modified:
    branches/gcc-4_6-branch/gcc/cp/ChangeLog
    branches/gcc-4_6-branch/gcc/cp/call.c
    branches/gcc-4_6-branch/gcc/cp/pt.c
    branches/gcc-4_6-branch/gcc/testsuite/ChangeLog