Mercurial > octave-nkf

changeset 5754:a9ac02e9fda5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-04-12 17:40:47 by jwe]
author jwe
date Wed, 12 Apr 2006 17:40:48 +0000
parents f243564379e5
children ca40a52804f4
files src/ChangeLog src/load-save.cc src/ls-oct-ascii.cc src/ls-oct-ascii.h
diffstat 4 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Apr 12 17:32:04 2006 +0000
+++ b/src/ChangeLog	Wed Apr 12 17:40:48 2006 +0000
@@ -1,3 +1,8 @@
+2006-04-12  John W. Eaton  <jwe@octave.org>
+
+	* load-save.cc (do_load): Declare count octave_idx_type, not int.
+	* ls-oct-ascii.cc, ls-oct-ascii.h (read_ascii_data): Likewise.
+
 2006-04-11  John W. Eaton  <jwe@octave.org>
 
 	* pt-assign.cc (tree_simple_assignment::rvalue,
--- a/src/load-save.cc	Wed Apr 12 17:32:04 2006 +0000
+++ b/src/load-save.cc	Wed Apr 12 17:40:48 2006 +0000
@@ -446,7 +446,7 @@
 
   OSSTREAM output_buf;
 
-  int count = 0;
+  octave_idx_type count = 0;
 
   for (;;)
     {
--- a/src/ls-oct-ascii.cc	Wed Apr 12 17:32:04 2006 +0000
+++ b/src/ls-oct-ascii.cc	Wed Apr 12 17:40:48 2006 +0000
@@ -272,7 +272,7 @@
 
 std::string
 read_ascii_data (std::istream& is, const std::string& filename, bool& global,
-		 octave_value& tc, int count)
+		 octave_value& tc, octave_idx_type count)
 {
   // Read name for this entry or break on EOF.
 
--- a/src/ls-oct-ascii.h	Wed Apr 12 17:32:04 2006 +0000
+++ b/src/ls-oct-ascii.h	Wed Apr 12 17:40:48 2006 +0000
@@ -46,7 +46,7 @@
 
 extern std::string
 read_ascii_data (std::istream& is, const std::string& filename, bool& global,
-		 octave_value& tc, int count);
+		 octave_value& tc, octave_idx_type count);
 
 extern bool
 save_ascii_data (std::ostream& os, const octave_value& val_arg,