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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6fd9b4b27ab2d667ce4681a2055772d6a2b3206a..b441bc027c48c5eeaf44a07ace08576958c2c993 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-19  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       PR c++/20240
+       * decl.c (decls_match): Compare context of VAR_DECL.
+
 2005-03-19  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
        PR c++/20333

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 84c25d467e0941c98549ab49e7aa16d53b6a7f16..6c7cece8eee11d83db88e596ff8834dd2d8b26f7 100644 (file)
--- 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 bdd7e7241e1fc7edd706f32a1163e387fccba175..296c059800768752f79c7b4e88d110f4e41785a6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-19  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       PR c++/20240
+       * g++.dg/lookup/using13.C: New test.
+
 2005-03-19  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
        PR c++/20333