From: Jason Merrill <jason@yorick.cygnus.com>
Date: Wed, 29 Jul 1998 13:04:57 +0000 (+0000)
Subject: * decl.c (lookup_name_real): Fix typo.
X-Git-Tag: prereleases/egcs-1.1-prerelease~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e1e21933be49a270d600631d468bc74fbaee73d;p=thirdparty%2Fgcc.git

* decl.c (lookup_name_real): Fix typo.

From-SVN: r21468
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c3700e4acd00..f7ab60b3331e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1998-07-29  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* decl.c (lookup_name_real): Fix typo.
+
 1998-07-28  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* class.c (finish_struct_1): Convert integer_zero_node to
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 0149679cb9e8..64d00dee30ef 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5089,7 +5089,7 @@ lookup_name_real (name, prefer_type, nonclass, namespaces_only)
 	     template parms because that breaks implicit typename for
 	     destructor calls.  */
 	  if (! uses_template_parms (got_object))
-	    val = got_object;
+	    val = from_obj;
 	}
 
       if ((TREE_CODE (val) == TEMPLATE_DECL && looking_for_template)