diff src/ls-mat-ascii.cc @ 5275:23b37da9fd5b

[project @ 2005-04-08 16:07:35 by jwe]
author jwe
date Fri, 08 Apr 2005 16:07:37 +0000
parents c7f9ea142fda
children 4c8a2e4e0717
line wrap: on
line diff
--- a/src/ls-mat-ascii.cc	Thu Apr 07 21:51:37 2005 +0000
+++ b/src/ls-mat-ascii.cc	Fri Apr 08 16:07:37 2005 +0000
@@ -108,7 +108,7 @@
 }
 
 static void
-get_lines_and_columns (std::istream& is, const std::string& filename, int& nr, int& nc)
+get_lines_and_columns (std::istream& is, const std::string& filename, octave_idx_type& nr, octave_idx_type& nc)
 {
   std::streampos pos = is.tellg ();
 
@@ -138,7 +138,7 @@
 	  beg = NPOS;
 	}
 
-      int tmp_nc = 0;
+      octave_idx_type tmp_nc = 0;
 
       while (beg != NPOS)
 	{
@@ -228,8 +228,8 @@
 
   if (valid_identifier (varname))
     {
-      int nr = 0;
-      int nc = 0;
+      octave_idx_type nr = 0;
+      octave_idx_type nc = 0;
 
       int total_count = 0;
 
@@ -246,7 +246,7 @@
 	  else
 	    {
 	      double d;
-	      for (int i = 0; i < nr; i++)
+	      for (octave_idx_type i = 0; i < nr; i++)
 		{
 		  std::string buf = get_mat_data_input_line (is);
 
@@ -256,7 +256,7 @@
 		  std::istrstream tmp_stream (buf.c_str ());
 #endif
 
-		  for (int j = 0; j < nc; j++)
+		  for (octave_idx_type j = 0; j < nc; j++)
 		    {
 		      OCTAVE_QUIT;
 
@@ -305,7 +305,7 @@
 	      if (is.eof ())
 		is.clear ();
 
-	      int expected = nr * nc;
+	      octave_idx_type expected = nr * nc;
 
 	      if (expected == total_count)
 		{