OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* name-lookup.c (do_namespace_alias): Use FROB_CONTEXT.
	* search.c (current_scope): Fix prototype.

From-SVN: r89632
This commit is contained in:
Mark Mitchell 2004-10-27 05:51:24 +00:00 committed by Mark Mitchell
parent 1aeaea8d7c
commit 6ac1920d89
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -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.

2
gcc/cp/name-lookup.c
View File

@ -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. */

2
gcc/cp/search.c
View File

@ -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