* decl2.c (push_decl_namespace): Push the original namespace.

From-SVN: r34845

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3063e0f..c937d7c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2000-07-03  Nathan Sidwell  <nathan@codesourcery.com>
 
+       * decl2.c (push_decl_namespace): Push the original namespace.
+
+2000-07-03  Nathan Sidwell  <nathan@codesourcery.com>
+
        * pt.c (instantiate_class_template): Set CLASSTYPE_VBASECLASSES.
        * semantics.c (begin_class_definition): Clear it.
 

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index c172d50..bbc66ad 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -4703,7 +4703,8 @@ push_decl_namespace (decl)
 {
   if (TREE_CODE (decl) != NAMESPACE_DECL)
     decl = decl_namespace (decl);
-  decl_namespace_list = tree_cons (decl, NULL_TREE, decl_namespace_list);
+  decl_namespace_list = tree_cons (ORIGINAL_NAMESPACE (decl),
+                                   NULL_TREE, decl_namespace_list);
 }
 
 void