PR c++/20240

	* decl.c (decls_match): Compare context of VAR_DECL.

	* g++.dg/lookup/using13.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96725 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aade257..f43fe55 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 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
        * parser.c (cp_parser_postfix_expression) <case RID_TYPENAME>:
        Check the return value of cp_parser_nested_name_specifier.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index d91b6ff..4887080 100644 (file)
--- 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 d223ddb..4d83920 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 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
        * g++.dg/template/crash36.C: New test.
 

diff --git a/gcc/testsuite/g++.dg/lookup/using13.C b/gcc/testsuite/g++.dg/lookup/using13.C
new file mode 100644 (file)
index 0000000..c102fdc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/using13.C
@@ -0,0 +1,12 @@
+// { dg-do compile }
+
+// Origin: Stefan Straßer <sstrasser@systemhaus-gruppe.de>
+
+// PR c++/20240: 
+
+namespace A { int a; }
+
+namespace C{
+  int a;
+  using A::a;          // { dg-error "already declared" }
+}