Mercurial > octave

changeset 21339:6228796397bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* symtab.cc: Avoid shadowed variable warnings.
author John W. Eaton <jwe@octave.org>
date Wed, 24 Feb 2016 13:06:53 -0500
parents 8fc2a9e0d729
children 9f838471a5da
files libinterp/corefcn/symtab.cc
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/symtab.cc	Wed Feb 24 13:06:25 2016 -0500
+++ b/libinterp/corefcn/symtab.cc	Wed Feb 24 13:06:53 2016 -0500
@@ -722,7 +722,7 @@
       // subfunctions if we are currently executing a function defined
       // from a .m file.
 
-      octave_user_function *curr_fcn = symbol_table::get_curr_fcn ();
+      octave_user_function *current_fcn = symbol_table::get_curr_fcn ();
 
       for (scope_id scope = xcurrent_scope; scope >= 0;)
         {
@@ -743,9 +743,9 @@
 
       // Private function.
 
-      if (curr_fcn)
+      if (current_fcn)
         {
-          std::string dir_name = curr_fcn->dir_name ();
+          std::string dir_name = current_fcn->dir_name ();
 
           if (! dir_name.empty ())
             {
@@ -942,11 +942,11 @@
 
   // Private function.
 
-  octave_user_function *curr_fcn = symbol_table::get_curr_fcn ();
+  octave_user_function *current_fcn = symbol_table::get_curr_fcn ();
 
-  if (curr_fcn)
+  if (current_fcn)
     {
-      std::string dir_name = curr_fcn->dir_name ();
+      std::string dir_name = current_fcn->dir_name ();
 
       if (! dir_name.empty ())
         {