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

name-lookup.c (lookup_name_real): Merge two if's.

Browse Source 
* name-lookup.c (lookup_name_real): Merge two if's.

From-SVN: r107500
This commit is contained in:
Volker Reichelt 2005-11-25 12:49:19 +00:00 committed by Volker Reichelt
parent 2678bae869
commit 0c8ce11b78
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2005-11-25 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
* name-lookup.c (lookup_name_real): Merge two if's.
2005-11-25 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
* pt.c (instantiate_class_template): Clean-up.

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

@ -3971,12 +3971,9 @@ lookup_name_real (tree name, int prefer_type, int nonclass, bool block_p,
if (!val)
val = unqualified_namespace_lookup (name, flags);
if (val)
{
/* 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);
}
/* 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);
POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, val);
}