# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1294863200 18000
# Node ID d86389a6dc3f19ab000569807885c02b493a2ee2
# Parent  5e8ba5b7aa4e49f6caaac86f2dd5135858ab237f
graphics.cc: avoid GCC warning

diff -r 5e8ba5b7aa4e -r d86389a6dc3f src/ChangeLog
--- a/src/ChangeLog	Wed Jan 12 15:12:07 2011 -0500
+++ b/src/ChangeLog	Wed Jan 12 15:13:20 2011 -0500
@@ -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::.
diff -r 5e8ba5b7aa4e -r d86389a6dc3f src/graphics.cc
--- a/src/graphics.cc	Wed Jan 12 15:12:07 2011 -0500
+++ b/src/graphics.cc	Wed Jan 12 15:13:20 2011 -0500
@@ -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 ();