r174506 - in /trunk/gcc: cp/ChangeLog cp/name-l...

[fabien@gcc.gnu.org]

Author: fabien
Date: Tue May 31 19:02:19 2011
New Revision: 174506

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=174506
Log:
gcc/cp/ChangeLog

2010-05-31  Fabien Chene  <fabien@gcc.gnu.org>

	PR c++/48010
	* name-lookup.c (supplement_binding_1): If the old binding was a
	type name, also check that the DECL actually refers to the same
	type or is not a type.

gcc/testsuite/ChangeLog

2010-05-31  Fabien Chene  <fabien@gcc.gnu.org>

	PR c++/48010
	* g++.dg/lookup/name-clash9.C: New.

Added:
    trunk/gcc/testsuite/g++.dg/lookup/name-clash9.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/name-lookup.c
    trunk/gcc/testsuite/ChangeLog