From a6567a0faaeafd7dc37eb6d52666c12f466c376f Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Fri, 20 Feb 2004 06:43:08 +0000 Subject: 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 --- gcc/cp/ChangeLog | 8 ++++++++ gcc/cp/name-lookup.c | 10 +++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/lookup/member1.C | 11 +++++++++++ 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/lookup/member1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e0cd765..d1dea6d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2004-02-19 Mark Mitchell + + 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 PR c++/14181 diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index e1cc770..e823ae3 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 45acf23..9ead668c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-02-19 Mark Mitchell + + PR c++/14186 + * g++.dg/lookup/member1.C: New test. + 2004-02-19 Kazu Hirata * gcc.c-torture/compile/20040130-1.c: Enable only when diff --git a/gcc/testsuite/g++.dg/lookup/member1.C b/gcc/testsuite/g++.dg/lookup/member1.C new file mode 100644 index 0000000..82bb657 --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/member1.C @@ -0,0 +1,11 @@ +// PR c++/14186 + +struct Base +{ + enum { Derived }; +}; + +class Derived : public Base +{ + Derived(); +}; -- cgit v1.1