From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Fri, 25 Nov 2005 12:49:19 +0000 (+0000)
Subject: name-lookup.c (lookup_name_real): Merge two if's.
X-Git-Tag: releases/gcc-4.2.0~5758
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c8ce11b78c9a138c99ae619ccc01221be383e2f;p=thirdparty%2Fgcc.git

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

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

From-SVN: r107500
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5d7c21be4853..865e5b7c9bff 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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.
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 49830c619792..dcd20f7e713e 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);
 }