* decl.c (lookup_name_real): Fix typo.

From-SVN: r21468

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c3700e4acd00238f89dd77f6028b169d5aa9028c..f7ab60b3331e15721ae389effc64f734d576984a 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  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 0149679cb9e8f4faf466c0daf03c6ba60bb0bb59..64d00dee30efce801d37e8732e20a0f2897d91c9 100644 (file)
--- 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)