Mercurial > hg > octave-avbm

changeset 14604:de72463862c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Silence warnings * graphics.cc (root_figure::properties::get_boundingbox): Remove unused variable. * symtab.cc (symbol_table::install_nestfunction): Rename clashing variable that shadows member.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Sun, 06 May 2012 21:14:55 -0400
parents 0d37fda09415
children 28e53daab1f8 f25d2224fa02
files src/graphics.cc src/symtab.cc
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/graphics.cc
+++ b/src/graphics.cc
@@ -3044,7 +3044,7 @@
 }
 
 Matrix
-root_figure::properties::get_boundingbox (bool internal, const Matrix&) const
+root_figure::properties::get_boundingbox (bool, const Matrix&) const
 {
   Matrix screen_size = screen_size_pixels ();
   Matrix pos = Matrix (1, 4, 0);
--- a/src/symtab.cc
+++ b/src/symtab.cc
@@ -1143,11 +1143,11 @@
   // Stash the nest_parent for resolving variables after parsing is done.
   octave_function *fv = fcn.function_value();
 
-  symbol_table *fcn_table = get_instance (fv->scope());
+  symbol_table *fcn_table_loc = get_instance (fv->scope());
 
   symbol_table *parent_table = get_instance (parent_scope);
 
-  parent_table->add_nest_child (*fcn_table);
+  parent_table->add_nest_child (*fcn_table_loc);
 }
 
 octave_value