diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2004-09-16 22:55:13 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2004-09-16 22:55:13 +0000 |
| commit | 67bcc252247fa1d0e45258c2ce927b666e621321 (patch) | |
| tree | 5ed6977bfd717a8ffbe954e1c51bdead6925576c /gcc | |
| parent | 1800536a055eefcd5877c11cdea3fa25d692589e (diff) | |
| download | gcc-67bcc252247fa1d0e45258c2ce927b666e621321.zip gcc-67bcc252247fa1d0e45258c2ce927b666e621321.tar.gz gcc-67bcc252247fa1d0e45258c2ce927b666e621321.tar.bz2 | |
re PR c++/17501 (Confusion with member templates)
PR c++/17501
* parser.c (cp_parser_nested_name_specifier): Do not resolve
typename types if the user explicitly said "typename".
PR c++/17501
* g++.dg/template/typename7.C: New test.
From-SVN: r87616
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/typename7.C | 19 |
4 files changed, 33 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2979b3d..8d5e2d4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-09-16 Mark Mitchell <mark@codesourcery.com> + + PR c++/17501 + * parser.c (cp_parser_nested_name_specifier): Do not resolve + typename types if the user explicitly said "typename". + 2004-09-16 Andrew MacLeod <amacleod@redhat.com> * error.c (dump_decl): Make sure there is lang_specific info before diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 05f447a..bfe749c 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -3497,7 +3497,9 @@ cp_parser_nested_name_specifier_opt (cp_parser *parser, look up names in "X<T>::I" in order to determine that "Y" is a template. So, if we have a typename at this point, we make an effort to look through it. */ - if (is_declaration && parser->scope + if (is_declaration + && !typename_keyword_p + && parser->scope && TREE_CODE (parser->scope) == TYPENAME_TYPE) parser->scope = resolve_typename_type (parser->scope, /*only_current_p=*/false); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 88ebcdc..7a5fed3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-09-16 Mark Mitchell <mark@codesourcery.com> + + PR c++/17501 + * g++.dg/template/typename7.C: New test. + 2004-09-16 Zdenek Dvorak <rakdver@atrey.karlin.mff.cuni.cz> * gcc.dg/tree-ssa/copy-headers.c: Update outcome. diff --git a/gcc/testsuite/g++.dg/template/typename7.C b/gcc/testsuite/g++.dg/template/typename7.C new file mode 100644 index 0000000..d9c8f26 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/typename7.C @@ -0,0 +1,19 @@ +// PR c++/17501 + +template<int> struct A; + +template<> struct A<0> +{ + struct B + { + struct C + { + typedef int D; + }; + }; +}; + +template<int I> struct E +{ + typename A<I>::B::C::D i; +}; |