Mercurial > hg > octave-lyh

changeset 7897:322a066543ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid shadow warning
author John W. Eaton <jwe@octave.org>
date Wed, 25 Jun 2008 08:05:33 -0400
parents 92c26470fe56
children cce16b4e0970
files src/ChangeLog src/debug.cc
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-23  John W. Eaton  <jwe@octave.org>
+
+	* debug.cc (Fdbstack): Avoid shadowed variable warning.
+
 2008-06-23  Jaroslav Hajek <highegg@gmail.com>
 
 	* genprops.awk (emit_source): Avoid gensub for portability.
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -757,9 +757,9 @@
 
       if (nargout == 0)
 	{
-	  octave_idx_type nframes = stk.numel ();
+	  octave_idx_type nframes_to_display = stk.numel ();
 
-	  if (nframes > 0)
+	  if (nframes_to_display > 0)
 	    {
 	      octave_stdout << "Stopped in:\n\n";
 
@@ -767,7 +767,7 @@
 	      Cell lines = stk.contents ("line");
 	      Cell columns = stk.contents ("column");
 
-	      for (octave_idx_type i = 0; i < nframes; i++)
+	      for (octave_idx_type i = 0; i < nframes_to_display; i++)
 		{
 		  octave_value name = names(i);
 		  octave_value line = lines(i);