OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/14186 (enum in base class conflicts with derived class) 

PR c++/14186
	* name-lookup.c (push_class_level_binding): Do not complain about
	adding a binding for a member whose name is the same as the
	enclosing class if the member is located in a base class of the
	current class.

	PR c++/14186
	* g++.dg/lookup/member1.C: New test.

From-SVN: r78149
This commit is contained in:
Mark Mitchell 2004-02-20 06:43:08 +00:00 committed by Mark Mitchell
parent f819a6a516
commit a6567a0faa
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2004-02-19 Mark Mitchell <mark@codesourcery.com>
PR c++/14186
* name-lookup.c (push_class_level_binding): Do not complain about
adding a binding for a member whose name is the same as the
enclosing class if the member is located in a base class of the
current class.
2004-02-19 Giovanni Bajo <giovannibajo@gcc.gnu.org>
PR c++/14181

10
gcc/cp/name-lookup.c
View File

@ -2762,9 +2762,13 @@ push_class_level_binding (tree name, tree x)
&& DECL_CONTEXT (x) != current_class_type))
&& DECL_NAME (x) == constructor_name (current_class_type))
{
error ("`%D' has the same name as the class in which it is declared",
x);
POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, false);
tree scope = context_for_name_lookup (x);
if (TYPE_P (scope) && same_type_p (scope, current_class_type))
{
error ("`%D' has the same name as the class in which it is declared",
x);
POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, false);
}
}
/* If this declaration shadows a declaration from an enclosing

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2004-02-19 Mark Mitchell <mark@codesourcery.com>
PR c++/14186
* g++.dg/lookup/member1.C: New test.
2004-02-19 Kazu Hirata <kazu@cs.umass.edu>
* gcc.c-torture/compile/20040130-1.c: Enable only when

11
gcc/testsuite/g++.dg/lookup/member1.C Normal file
View File

@ -0,0 +1,11 @@
// PR c++/14186
struct Base
{
enum { Derived };
};
class Derived : public Base
{
Derived();
};