From 91a5bc9f9a8faf903c54b22a6e43e8450dd9a50f Mon Sep 17 00:00:00 2001 From: Kriang Lerdsuwanakij Date: Sat, 19 Mar 2005 12:35:24 +0000 Subject: [PATCH] re PR c++/20240 (invalid using-redeclaration accepted) PR c++/20240 * decl.c (decls_match): Compare context of VAR_DECL. * g++.dg/lookup/using13.C: New test. From-SVN: r96725 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/lookup/using13.C | 12 ++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 gcc/testsuite/g++.dg/lookup/using13.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aade257bcb6..f43fe55e275 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2005-03-19 Kriang Lerdsuwanakij + + PR c++/20240 + * decl.c (decls_match): Compare context of VAR_DECL. + 2005-03-19 Kriang Lerdsuwanakij PR c++/20333 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index d91b6ff302c..4887080fa30 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -948,6 +948,12 @@ decls_match (tree newdecl, tree olddecl) } else { + /* Need to check scope for variable declaration (VAR_DECL). + For typedef (TYPE_DECL), scope is ignored. */ + if (TREE_CODE (newdecl) == VAR_DECL + && CP_DECL_CONTEXT (newdecl) != CP_DECL_CONTEXT (olddecl)) + return 0; + if (TREE_TYPE (newdecl) == error_mark_node) types_match = TREE_TYPE (olddecl) == error_mark_node; else if (TREE_TYPE (olddecl) == NULL_TREE) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d223ddb3eb3..4d8392038ea 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-03-19 Kriang Lerdsuwanakij + + PR c++/20240 + * g++.dg/lookup/using13.C: New test. + 2005-03-19 Kriang Lerdsuwanakij PR c++/20333 diff --git a/gcc/testsuite/g++.dg/lookup/using13.C b/gcc/testsuite/g++.dg/lookup/using13.C new file mode 100644 index 00000000000..c102fdcf872 --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/using13.C @@ -0,0 +1,12 @@ +// { dg-do compile } + +// Origin: Stefan Straßer + +// PR c++/20240: + +namespace A { int a; } + +namespace C{ + int a; + using A::a; // { dg-error "already declared" } +}