r192470 - in /trunk/gcc: cp/ChangeLog cp/parser...

[paolo@gcc.gnu.org]

Author: paolo
Date: Mon Oct 15 19:13:41 2012
New Revision: 192470

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=192470
Log:
/cp
2012-10-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50080 (again)
	* parser.c (cp_parser_optional_template_keyword): When -pedantic
	and C++98 mode restore pre-Core/468 behavior.

/testsuite
2012-10-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50080 (again)
	* g++.dg/parse/tmpl-outside2.C: Tweak, error in C++98.
	* g++.dg/parse/tmpl-outside1.C: Likewise.
	* g++.dg/template/qualttp18.C: Likewise.
	* g++.old-deja/g++.pt/memtemp87.C: Likewise.
	* g++.old-deja/g++.pt/overload13.C: Likewise.

Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/parser.c
    trunk/gcc/testsuite/ChangeLog
    trunk/gcc/testsuite/g++.dg/parse/tmpl-outside1.C
    trunk/gcc/testsuite/g++.dg/parse/tmpl-outside2.C
    trunk/gcc/testsuite/g++.dg/template/qualttp18.C
    trunk/gcc/testsuite/g++.old-deja/g++.pt/memtemp87.C
    trunk/gcc/testsuite/g++.old-deja/g++.pt/overload13.C