r181538 - in /trunk/gcc: cp/ChangeLog cp/error....

[paolo@gcc.gnu.org]

Author: paolo
Date: Sun Nov 20 22:37:54 2011
New Revision: 181538

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=181538
Log:
/cp
2011-11-20  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51230
	* pt.c (unify_inconsistency): Handle non-type parameters better.
	* error.c (dump_expr): Handle TEMPLATE_TEMPLATE_PARM.

/cp
2011-11-20  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51230
	* g++.dg/template/error46.C: New.


Added:
    trunk/gcc/testsuite/g++.dg/template/error46.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/error.c
    trunk/gcc/cp/pt.c
    trunk/gcc/testsuite/ChangeLog