aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2006-01-13 19:47:48 -0500
committerJason Merrill <jason@gcc.gnu.org>2006-01-13 19:47:48 -0500
commitddf74938594734e6e28d35b0086352894b8beb2d (patch)
tree61c7adbea32b78ed15dc8f66f3a94e6abf4c7ca5 /gcc
parent74d7b5016e12c9d267bab53ce2c1d311215ef4f0 (diff)
downloadgcc-ddf74938594734e6e28d35b0086352894b8beb2d.zip
gcc-ddf74938594734e6e28d35b0086352894b8beb2d.tar.gz
gcc-ddf74938594734e6e28d35b0086352894b8beb2d.tar.bz2
* pt.c (check_explicit_specialization): Use CP_DECL_CONTEXT even more.
From-SVN: r109693
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/cp/pt.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ac1e073..8c5a33c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
2006-01-13 Jason Merrill <jason@redhat.com>
+ * 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 b828f56..23c84cd 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);