decl.c (push_overloaded_decl): Use current_namespace instead of DECL_CONTEXT (decl...

	* decl.c (push_overloaded_decl): Use current_namespace instead of
	DECL_CONTEXT (decl) to determine where we go.

From-SVN: r21472

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f7ab60b3331e15721ae389effc64f734d576984a..a845e48794dce4aba1dacafcdaeca87f15f29568 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 1998-07-29  Jason Merrill  <jason@yorick.cygnus.com>
 
+       * decl.c (push_overloaded_decl): Use current_namespace instead of
+       DECL_CONTEXT (decl) to determine where we go.
+
        * decl.c (lookup_name_real): Fix typo.
 
 1998-07-28  Jason Merrill  <jason@yorick.cygnus.com>

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 64d00dee30efce801d37e8732e20a0f2897d91c9..4ffe6d97358ba714d04b73f599bc99ea618c51ec 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3982,7 +3982,7 @@ push_overloaded_decl (decl, forgettable)
     old = decl;
 
   if (doing_global)
-    set_namespace_binding (orig_name, DECL_CONTEXT (decl), old);
+    set_namespace_binding (orig_name, current_namespace, old);
   else
     IDENTIFIER_LOCAL_VALUE (orig_name) = old;