]> gcc.gnu.org Git - gcc.git/commit
PR c++/13950, DR 176
authorJason Merrill <jason@redhat.com>
Mon, 16 Nov 2009 23:29:25 +0000 (18:29 -0500)
committerJason Merrill <jason@gcc.gnu.org>
Mon, 16 Nov 2009 23:29:25 +0000 (18:29 -0500)
commit5a080ad7b0dc031e2b2c7f49fdb0ebf7d3d35514
treed01fd61cab03b29407d10ef9f75bd71d4bae928a
parent87213cd4965fb065bf1e57f6acd34df1695fedc0
PR c++/13950, DR 176

PR c++/13950, DR 176
* search.c (lookup_field_r): Allow lookup to find the
injected-class-name from a template base.
(template_self_reference_p): Remove.
* decl.c (make_typename_type): Diagnose ambiguity.  Use
maybe_get_template_decl_from_type_decl.
* parser.c (cp_parser_template_name): Pass true to is_template
rather than use maybe_get_template_decl_from_type_decl.
(cp_parser_lookup_name): Use maybe_get_template_decl_from_type_decl.
* pt.c (maybe_get_template_decl_from_type_decl): Handle ambiguity.
Use DECL_SELF_REFERENCE_P.

* parser.c (cp_parser_parse_and_diagnose_invalid_type_name):
Avoid duplicate ambiguity error.
* error.c (dump_decl): Don't say "typedef" for injected-class-name.
* pt.c (convert_template_argument): Tweak logic.

From-SVN: r154223
13 files changed:
gcc/cp/ChangeLog
gcc/cp/decl.c
gcc/cp/error.c
gcc/cp/parser.c
gcc/cp/pt.c
gcc/cp/search.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/template/inherit.C
gcc/testsuite/g++.dg/template/injected1.C [new file with mode: 0644]
gcc/testsuite/g++.old-deja/g++.brendan/crash56.C
gcc/testsuite/g++.old-deja/g++.pt/lookup8.C
gcc/testsuite/g++.old-deja/g++.pt/ttp22.C
gcc/testsuite/g++.old-deja/g++.pt/ttp23.C
This page took 0.061543 seconds and 5 git commands to generate.