From 756cee388ffcdd4ecab29b1d10475e7438159312 Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 20 Jun 2012 07:21:40 +0000 Subject: [PATCH] PR c++/53599 * pt.c (lookup_template_class_1): Use ts_global. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188809 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eac061e2d06..4ac2cb71f4d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2012-06-19 Jason Merrill + + PR c++/53599 + * pt.c (lookup_template_class_1): Use ts_global. + 2012-06-14 Richard Guenther Backport from mainline diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index e4631e7ae0d..565cd9a0fdb 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7564,7 +7564,7 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context, /* A local class. Make sure the decl gets registered properly. */ if (context == current_function_decl) - pushtag (DECL_NAME (gen_tmpl), t, /*tag_scope=*/ts_current); + pushtag (DECL_NAME (gen_tmpl), t, /*tag_scope=*/ts_global); if (comp_template_args (CLASSTYPE_TI_ARGS (template_type), arglist)) /* This instantiation is another name for the primary diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 97a7950a916..9a8d5dccb52 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-06-19 Jason Merrill + + PR c++/53599 + * g++.dg/template/local7.C: New. + 2012-06-16 Venkataramanan Kumar Back port from mainline -- 2.11.0