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: r21473

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 05a447915de1b19d7e3dfc3ee50f87ad82a638ef..69c8447c6b91489527ffba3f78494150a7d796d0 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  Mark Mitchell  <mark@markmitchell.com>

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 3b5994d56e46a616957b34c702865124660ca014..2558386f0b8b33e362839c2af1b2d644afa7413c 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;