diff options
| author | Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> | 2005-03-19 12:35:24 +0000 |
|---|---|---|
| committer | Kriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org> | 2005-03-19 12:35:24 +0000 |
| commit | 91a5bc9f9a8faf903c54b22a6e43e8450dd9a50f (patch) | |
| tree | a23dc4b78711e905b4f691c742d34d1e506a4242 /gcc | |
| parent | 26c895e7dc411d217603e6b2f944b9750c4404d2 (diff) | |
| download | gcc-91a5bc9f9a8faf903c54b22a6e43e8450dd9a50f.zip gcc-91a5bc9f9a8faf903c54b22a6e43e8450dd9a50f.tar.gz gcc-91a5bc9f9a8faf903c54b22a6e43e8450dd9a50f.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lookup/using13.C | 12 |
4 files changed, 28 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aade257..f43fe55 100644 --- 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 --- 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 --- 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 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" } +} |