From ddf74938594734e6e28d35b0086352894b8beb2d Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 13 Jan 2006 19:47:48 -0500 Subject: [PATCH] * pt.c (check_explicit_specialization): Use CP_DECL_CONTEXT even more. From-SVN: r109693 --- gcc/cp/ChangeLog | 2 ++ gcc/cp/pt.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ac1e073186e..8c5a33c7043 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2006-01-13 Jason Merrill + * pt.c (check_explicit_specialization): Use CP_DECL_CONTEXT even more. + * name-lookup.c (set_decl_namespace): Use CP_DECL_CONTEXT. * pt.c (check_explicit_specialization): Likewise. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index b828f569a12..23c84cde0da 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -1901,7 +1901,7 @@ check_explicit_specialization (tree declarator, /* Find the namespace binding, using the declaration context. */ - fns = lookup_qualified_name (current_namespace, dname, + fns = lookup_qualified_name (CP_DECL_CONTEXT (decl), dname, false, true); if (!fns || !is_overloaded_fn (fns)) { @@ -1911,7 +1911,7 @@ check_explicit_specialization (tree declarator, else { tree fn = OVL_CURRENT (fns); - if (!is_associated_namespace (current_namespace, + if (!is_associated_namespace (CP_DECL_CONTEXT (decl), CP_DECL_CONTEXT (fn))) error ("%qD is not declared in %qD", decl, current_namespace);