aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@yorick.cygnus.com>1998-07-29 14:56:33 +0000
committerJason Merrill <jason@gcc.gnu.org>1998-07-29 10:56:33 -0400
commit19f1bd3476fd1c2eeb36ef5943af1e6431c8c726 (patch)
tree124bb11906142af212fca88b65f411597b4102a9 /gcc/cp
parente0d75375e722d868b1544fe69b3cb2f7b35ce434 (diff)
downloadgcc-19f1bd3476fd1c2eeb36ef5943af1e6431c8c726.zip
gcc-19f1bd3476fd1c2eeb36ef5943af1e6431c8c726.tar.gz
gcc-19f1bd3476fd1c2eeb36ef5943af1e6431c8c726.tar.bz2
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: r21473
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/decl.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 05a4479..69c8447 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 Mark Mitchell <mark@markmitchell.com>
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 3b5994d..2558386 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;