Mercurial > hg > octave-nkf
changeset 11492:d86389a6dc3f
graphics.cc: avoid GCC warning
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 12 Jan 2011 15:13:20 -0500 |
parents | 5e8ba5b7aa4e |
children | a339b7a7f73b |
files | src/ChangeLog src/graphics.cc |
diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-01-12 John W. Eaton <jwe@octave.org> + + * graphics.cc (graphics_object::get_ancestor): Avoid GCC warning. + 2011-01-12 John W. Eaton <jwe@octave.org> * DLD-FUNCTIONS/gcd.cc (extended_gcd): Tag call to floor with gnulib::.
--- a/src/graphics.cc +++ b/src/graphics.cc @@ -2534,14 +2534,14 @@ } graphics_object -graphics_object::get_ancestor (const std::string& type) const +graphics_object::get_ancestor (const std::string& obj_type) const { if (valid_object ()) { - if (isa (type)) + if (isa (obj_type)) return *this; else - return gh_manager::get_object (get_parent ()).get_ancestor (type); + return gh_manager::get_object (get_parent ()).get_ancestor (obj_type); } else return graphics_object ();