PR c++/53492
commitb919371fd3f46fb6c50020febfe7b68ec122bb5b
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 10 Mar 2014 15:44:50 +0000 (10 15:44 +0000)
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 10 Mar 2014 15:44:50 +0000 (10 15:44 +0000)
tree88eab3ba0706e5f72df74b8eab5b4eb752e653fb
parent9f0b7378b37fbaa44955e3068ac2975c5ae47b1a
PR c++/53492
* parser.c (cp_parser_class_head): Also check PRIMARY_TEMPLATE_P
when deciding whether to call push_template_decl for a member class.
* pt.c (push_template_decl_real): Return after wrong levels error.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208455 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/cp/ChangeLog
gcc/cp/parser.c
gcc/cp/pt.c
gcc/testsuite/g++.dg/template/memtmpl4.C [new file with mode: 0644]