* decl.c (lookup_name_real): Fix typo.

From-SVN: r21469

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index db4baa19242fd01f10bbb39098847470686d3eb1..05a447915de1b19d7e3dfc3ee50f87ad82a638ef 100644 (file)
--- 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 aa5204ec84461ad2bd1aa70a40b7e617f4c5c5ae..3b5994d56e46a616957b34c702865124660ca014 100644 (file)
--- 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)