aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@yorick.cygnus.com>1998-07-29 13:05:28 +0000
committerJason Merrill <jason@gcc.gnu.org>1998-07-29 09:05:28 -0400
commit53fdbb3b3697b6688745bcb2628eb1873f46cec0 (patch)
tree303fecbef122f60f0bb4a287030f330f0a59ae59
parent53624284c641cc00af8e075cf4d91873e935b414 (diff)
downloadgcc-53fdbb3b3697b6688745bcb2628eb1873f46cec0.zip
gcc-53fdbb3b3697b6688745bcb2628eb1873f46cec0.tar.gz
gcc-53fdbb3b3697b6688745bcb2628eb1873f46cec0.tar.bz2
* decl.c (lookup_name_real): Fix typo.
From-SVN: r21469
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/decl.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index db4baa1..05a4479 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 aa5204e..3b5994d 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)