From f0652ba98fe6e29216e9dbe880b18632708950fe Mon Sep 17 00:00:00 2001 From: drow Date: Mon, 24 Jul 2006 02:58:08 +0000 Subject: [PATCH] PR c++/28460 * decl.c (grokvardecl): Use FROB_CONTEXT. * pt.c (register_specialization): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115703 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 2 +- gcc/cp/pt.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a5848b82aa8..d0bbac5a40a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-07-23 Daniel Jacobowitz + + PR c++/28460 + * decl.c (grokvardecl): Use FROB_CONTEXT. + * pt.c (register_specialization): Likewise. + 2006-07-23 Mark Mitchell PR c++/28025 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 14977496bab..ad35161481c 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6289,7 +6289,7 @@ grokvardecl (tree type, if (explicit_scope && TREE_CODE (explicit_scope) == NAMESPACE_DECL) set_decl_namespace (decl, explicit_scope, 0); else - DECL_CONTEXT (decl) = scope; + DECL_CONTEXT (decl) = FROB_CONTEXT (scope); if (declspecs->storage_class == sc_extern) { diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index e76ad2db346..0b852fa2df4 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -1224,7 +1224,7 @@ register_specialization (tree spec, tree tmpl, tree args, bool is_friend) template it is specializing. */ if (DECL_TEMPLATE_SPECIALIZATION (spec) && !check_specialization_namespace (tmpl)) - DECL_CONTEXT (spec) = decl_namespace_context (tmpl); + DECL_CONTEXT (spec) = FROB_CONTEXT (decl_namespace_context (tmpl)); if (!optimize_specialization_lookup_p (tmpl)) DECL_TEMPLATE_SPECIALIZATIONS (tmpl) -- 2.11.0