diff options
| author | Volker Reichelt <reichelt@igpm.rwth-aachen.de> | 2005-11-25 12:49:19 +0000 |
|---|---|---|
| committer | Volker Reichelt <reichelt@gcc.gnu.org> | 2005-11-25 12:49:19 +0000 |
| commit | 0c8ce11b78c9a138c99ae619ccc01221be383e2f (patch) | |
| tree | 091e8d623a4a8360f211fe4a3482808e559aa93a /gcc/cp | |
| parent | 2678bae869c78a3848e54835535de147a53b77cf (diff) | |
| download | gcc-0c8ce11b78c9a138c99ae619ccc01221be383e2f.zip gcc-0c8ce11b78c9a138c99ae619ccc01221be383e2f.tar.gz gcc-0c8ce11b78c9a138c99ae619ccc01221be383e2f.tar.bz2 | |
name-lookup.c (lookup_name_real): Merge two if's.
* name-lookup.c (lookup_name_real): Merge two if's.
From-SVN: r107500
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5d7c21b..865e5b7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 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. 2005-11-25 Volker Reichelt <reichelt@igpm.rwth-aachen.de> diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 49830c6..dcd20f7 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -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); } |