[Bug c++/60167] [4.9 regression] Bogus error: conflicting declaration

[jason at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60167

--- Comment #4 from Jason Merrill <jason at gcc dot gnu.org> ---
Author: jason
Date: Fri Feb 21 14:00:44 2014
New Revision: 207994

URL: http://gcc.gnu.org/viewcvs?rev=207994&root=gcc&view=rev
Log:
    PR c++/60167
    PR c++/60222
    PR c++/58606
    * parser.c (cp_parser_template_argument): Restore dereference.
    * pt.c (template_parm_to_arg): Dereference non-pack expansions too.
    (process_partial_specialization): Handle deref.
    (unify): Likewise.

Added:
    trunk/gcc/testsuite/g++.dg/template/ref7.C
    trunk/gcc/testsuite/g++.dg/template/ref8.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/parser.c
    trunk/gcc/cp/pt.c