From: Jason Merrill <jason@yorick.cygnus.com>
Date: Wed, 29 Jul 1998 13:05:28 +0000 (+0000)
Subject: * decl.c (lookup_name_real): Fix typo.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=53fdbb3b3697b6688745bcb2628eb1873f46cec0;p=gcc.git

* decl.c (lookup_name_real): Fix typo.

From-SVN: r21469
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index db4baa19242..05a447915de 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  Mark Mitchell  <mark@markmitchell.com>
 
 	* friend.c (is_friend): Be lenient with member functions to deal
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index aa5204ec844..3b5994d56e4 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5113,7 +5113,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)