* name-lookup.c (do_namespace_alias): Use FROB_CONTEXT.

	* search.c (current_scope): Fix prototype.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89632 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d9e8ce7..5531604 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-26  Mark Mitchell  <mark@codesourcery.com>
 
+       * name-lookup.c (do_namespace_alias): Use FROB_CONTEXT.
+       * search.c (current_scope): Fix prototype.
+
        PR c++/18093
        * search.c (current_scope): Return the innermost non-block scope,
        not the innermost non-block, non-namespace scope.

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 423a4b9..7dc19f8 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -3227,7 +3227,7 @@ do_namespace_alias (tree alias, tree namespace)
   alias = build_lang_decl (NAMESPACE_DECL, alias, void_type_node);     
   DECL_NAMESPACE_ALIAS (alias) = namespace;
   DECL_EXTERNAL (alias) = 1;
-  DECL_CONTEXT (alias) = current_scope ();
+  DECL_CONTEXT (alias) = FROB_CONTEXT (current_scope ());
   pushdecl (alias);
 
   /* Emit debug info for namespace alias.  */

diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 5f8f081..68a42f2 100644 (file)
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -501,7 +501,7 @@ lookup_field_1 (tree type, tree name, bool want_type)
    NAMESPACE_DECL corresponding to the innermost non-block scope.  */  
 
 tree
-current_scope ()
+current_scope (void)
 {
   /* There are a number of cases we need to be aware of here:
                         current_class_type     current_function_decl