mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-10 08:09:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

decl.c (lookup_name_real): Pull out single function here.

Browse Source 
* decl.c (lookup_name_real): Pull out single function here.
	(select_decl): Not here.
	(unqualified_namespace_lookup): Use CP_DECL_CONTEXT.

From-SVN: r21268
This commit is contained in:
Jason Merrill 1998-07-18 02:26:44 +00:00 committed by Jason Merrill
parent f193b4b996
commit 0c64a9cab4
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
1998-07-17 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (lookup_name_real): Pull out single function here.
(select_decl): Not here.
(unqualified_namespace_lookup): Use CP_DECL_CONTEXT.
* decl.c (qualify_lookup): Tweak again.
* pt.c (lookup_template_class): Don't mess with the context of the

12
gcc/cp/decl.c
View File

@ -4792,10 +4792,6 @@ select_decl (binding, flags)
&& (!looking_for_template || TREE_CODE (val) != TEMPLATE_DECL))
val = NULL_TREE;
/* If we have a single function from a using decl, pull it out. */
if (val && TREE_CODE (val) == OVERLOAD && ! really_overloaded_fn (val))
val = OVL_FUNCTION (val);
return val;
}
@ -4848,9 +4844,7 @@ unqualified_namespace_lookup (name, flags)
val = select_decl (b, flags);
if (scope == global_namespace)
break;
scope = DECL_CONTEXT (scope);
if (scope == NULL_TREE)
scope = global_namespace;
scope = CP_DECL_CONTEXT (scope);
}
return val;
}
@ -5102,6 +5096,10 @@ lookup_name_real (name, prefer_type, nonclass, namespaces_only)
val = TYPE_MAIN_DECL (IDENTIFIER_TYPE_VALUE (name));
else if (TREE_TYPE (val) == error_mark_node)
val = error_mark_node;
/* If we have a single function from a using decl, pull it out. */
if (TREE_CODE (val) == OVERLOAD && ! really_overloaded_fn (val))
val = OVL_FUNCTION (val);
}
else if (from_obj)
val = from_obj;