Mercurial > octave-nkf

changeset 19408:27f5d1607b84 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid shadowed variable warning * graphics.cc (gtk_manager::do_unregister_toolkit): Avoid shadowed variable warning.
author John W. Eaton <jwe@octave.org>
date Tue, 02 Dec 2014 09:55:12 -0500
parents 7467c3e773fd
children 264ff6bf7475
files libinterp/corefcn/graphics.cc
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc	Fri Nov 28 08:22:51 2014 -0800
+++ b/libinterp/corefcn/graphics.cc	Tue Dec 02 09:55:12 2014 -0500
@@ -9657,12 +9657,12 @@
 
           while (pa != available_toolkits.end ())
             {
-              std::string name = *pa++;
-
-              if (name == "qt"
-                  || (name == "fltk"
+              std::string toolkit = *pa++;
+
+              if (toolkit == "qt"
+                  || (toolkit == "fltk"
                       && available_toolkits.find ("qt") == available_toolkits.end ()))
-                dtk = name;
+                dtk = toolkit;
             }
         }
     }