From: Jason Merrill <jason@yorick.cygnus.com>
Date: Wed, 29 Jul 1998 14:56:23 +0000 (+0000)
Subject: decl.c (push_overloaded_decl): Use current_namespace instead of DECL_CONTEXT (decl... 
X-Git-Tag: prereleases/egcs-1.1-prerelease~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f3e8e24b2ee2590a335af26826f395003a8e2e6;p=thirdparty%2Fgcc.git

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

	* 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 f7ab60b3331e..a845e48794dc 100644
--- 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 64d00dee30ef..4ffe6d97358b 100644
--- 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;