r207213 - in /branches/gcc-4_8-branch/gcc: cp/C...

[jason@gcc.gnu.org]

Author: jason
Date: Tue Jan 28 21:33:55 2014
New Revision: 207213

URL: http://gcc.gnu.org/viewcvs?rev=207213&root=gcc&view=rev
Log:
	PR c++/58632
	* decl.c (lookup_and_check_tag): Ignore template parameters if
	scope == ts_current.
	* pt.c (check_template_shadow): Don't complain about the injected
	class name.

Added:
    branches/gcc-4_8-branch/gcc/testsuite/g++.dg/template/shadow1.C
Modified:
    branches/gcc-4_8-branch/gcc/cp/ChangeLog
    branches/gcc-4_8-branch/gcc/cp/decl.c
    branches/gcc-4_8-branch/gcc/cp/pt.c