Mercurial > octave

changeset 3514:1d79338a016c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-02-01 22:36:48 by jwe]
author jwe
date Tue, 01 Feb 2000 22:36:48 +0000
parents 6b8d14532d86
children f84c0b63b3df
files liboctave/Array2-idx.h
diffstat 1 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array2-idx.h	Tue Feb 01 22:32:40 2000 +0000
+++ b/liboctave/Array2-idx.h	Tue Feb 01 22:36:48 2000 +0000
@@ -257,15 +257,15 @@
     {
       int new_n = n;
 
-      int idx = 0;
+      int iidx = 0;
 
       for (int i = 0; i < n; i++)
-	if (i == idx_arg.elem (idx))
+	if (i == idx_arg.elem (iidx))
 	  {
-	    idx++;
+	    iidx++;
 	    new_n--;
 
-	    if (idx == num_to_delete)
+	    if (iidx == num_to_delete)
 	      break;
 	  }
 
@@ -274,11 +274,11 @@
 	  T *new_data = new T [new_n];
 
 	  int ii = 0;
-	  idx = 0;
+	  iidx = 0;
 	  for (int i = 0; i < n; i++)
 	    {
-	      if (idx < num_to_delete && i == idx_arg.elem (idx))
-		idx++;
+	      if (iidx < num_to_delete && i == idx_arg.elem (iidx))
+		iidx++;
 	      else
 		{
 		  if (nr == 1)
@@ -438,15 +438,15 @@
 		{
 		  int new_nr = nr;
 
-		  int idx = 0;
+		  int iidx = 0;
 
 		  for (int i = 0; i < nr; i++)
-		    if (i == idx_i.elem (idx))
+		    if (i == idx_i.elem (iidx))
 		      {
-			idx++;
+			iidx++;
 			new_nr--;
 
-			if (idx == num_to_delete)
+			if (iidx == num_to_delete)
 			  break;
 		      }
 
@@ -455,11 +455,11 @@
 		      T *new_data = new T [new_nr * nc];
 
 		      int ii = 0;
-		      idx = 0;
+		      iidx = 0;
 		      for (int i = 0; i < nr; i++)
 			{
-			  if (idx < num_to_delete && i == idx_i.elem (idx))
-			    idx++;
+			  if (iidx < num_to_delete && i == idx_i.elem (iidx))
+			    iidx++;
 			  else
 			    {
 			      for (int j = 0; j < nc; j++)