name-lookup.c (set_decl_namespace): Use CP_DECL_CONTEXT.

        * name-lookup.c (set_decl_namespace): Use CP_DECL_CONTEXT.
        * pt.c (check_explicit_specialization): Likewise.

From-SVN: r109672

gcc/cp/ChangeLog

+2006-01-13  Jason Merrill  <jason@redhat.com>
+
+	* name-lookup.c (set_decl_namespace): Use CP_DECL_CONTEXT.
+	* pt.c (check_explicit_specialization): Likewise.
+
 2006-01-12  Jason Merrill  <jason@redhat.com>
 
 	PR libstdc++/24660

gcc/cp/name-lookup.c

@@ -2878,7 +2878,7 @@ set_decl_namespace (tree decl, tree scope, bool friendp)
   if (!is_overloaded_fn (old))
     goto complain;
   fn = OVL_CURRENT (old);
-  if (!is_associated_namespace (scope, DECL_CONTEXT (fn)))
+  if (!is_associated_namespace (scope, CP_DECL_CONTEXT (fn)))
     goto complain;
   /* A template can be explicitly specialized in any namespace.  */
   if (processing_explicit_instantiation)

gcc/cp/pt.c

@@ -1911,8 +1911,10 @@ check_explicit_specialization (tree declarator,
 	      else
 		{
 		  tree fn = OVL_CURRENT (fns);
-		  if (!is_associated_namespace (current_namespace, DECL_CONTEXT (fn)))
-		    error ("%qD is not declared in %qD", decl, current_namespace);
+		  if (!is_associated_namespace (current_namespace,
+						CP_DECL_CONTEXT (fn)))
+		    error ("%qD is not declared in %qD",
+			   decl, current_namespace);
 		}
 	    }