From ada60fba69699026e4cef161030569e08f470762 Mon Sep 17 00:00:00 2001 From: Kriang Lerdsuwanakij Date: Sat, 19 Mar 2005 14:01:01 +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: r96729 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6fd9b4b27ab2..b441bc027c48 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 84c25d467e09..6c7cece8eee1 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1068,6 +1068,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 bdd7e7241e1f..296c05980076 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 -- 2.47.2