]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
name-lookup.c (lookup_name_real): Merge two if's.
authorVolker Reichelt <reichelt@igpm.rwth-aachen.de>
Fri, 25 Nov 2005 12:49:19 +0000 (12:49 +0000)
committerVolker Reichelt <reichelt@gcc.gnu.org>
Fri, 25 Nov 2005 12:49:19 +0000 (12:49 +0000)
* name-lookup.c (lookup_name_real): Merge two if's.

From-SVN: r107500

gcc/cp/ChangeLog
gcc/cp/name-lookup.c

index 5d7c21be48531992bbea2a98fbfc31dc36a9a6c3..865e5b7c9bff6abfb9330f97098d190a04b7079f 100644 (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.
index 49830c619792b221d3920c9ce06836cfd49a00e9..dcd20f7e713e39bd4ae22c10f86b7ef25c549e99 100644 (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);
 }