diff options
author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-07-29 13:05:28 +0000 |
---|---|---|
committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-07-29 13:05:28 +0000 |
commit | 698960f125e8e0c055f2bf494d86f91a8e7ba580 (patch) | |
tree | 303fecbef122f60f0bb4a287030f330f0a59ae59 /gcc | |
parent | 7cad346a0a029359d97dbb22fcd6e576e8380043 (diff) | |
download | ppe42-gcc-698960f125e8e0c055f2bf494d86f91a8e7ba580.tar.gz ppe42-gcc-698960f125e8e0c055f2bf494d86f91a8e7ba580.zip |
* decl.c (lookup_name_real): Fix typo.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@21469 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/cp/decl.c | 2 |
2 files changed, 5 insertions, 1 deletions
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) |