Mercurial > octave-nkf

changeset 3739:85027c5aedc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-11-21 01:55:32 by jwe]
author jwe
date Tue, 21 Nov 2000 01:55:32 +0000
parents f20c30fa3a8d
children 0228f57f88c3
files liboctave/ChangeLog liboctave/data-conv.h
diffstat 2 files changed, 19 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Fri Nov 17 20:10:23 2000 +0000
+++ b/liboctave/ChangeLog	Tue Nov 21 01:55:32 2000 +0000
@@ -1,3 +1,8 @@
+2000-11-20  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* data-conv.h (enum save_type): Move LS_U_LONG and LS_LONG to the
+	end of the list, to be compatible with previous versions of Octave.
+
 2000-11-16  Paul Kienzle  <pkienzle@kienzle.powernet.co.uk>
 
 	* oct-time.cc (DEFINE_SET_INT_FIELD_FCN): Don't check limits here,
--- a/liboctave/data-conv.h	Fri Nov 17 20:10:23 2000 +0000
+++ b/liboctave/data-conv.h	Tue Nov 21 01:55:32 2000 +0000
@@ -85,22 +85,22 @@
   static data_type string_to_data_type (const std::string& s);
 };
 
+// Add new entries to the end of this enum, otherwise Octave will not
+// be able to read binary data files stored in Octave's binary data
+// format that were created with previous versions of Octave.
+
 enum save_type
   {
-    LS_U_CHAR,
-    LS_U_SHORT,
-    LS_U_INT,
-#ifdef EIGHT_BYTE_INT
-    LS_U_LONG,
-#endif
-    LS_CHAR,
-    LS_SHORT,
-    LS_INT,
-#ifdef EIGHT_BYTE_INT
-    LS_LONG,
-#endif
-    LS_FLOAT,
-    LS_DOUBLE
+    LS_U_CHAR  = 0,
+    LS_U_SHORT = 1,
+    LS_U_INT   = 2,
+    LS_CHAR    = 3,
+    LS_SHORT   = 4,
+    LS_INT     = 5,
+    LS_FLOAT   = 6,
+    LS_DOUBLE  = 7,
+    LS_U_LONG  = 8,
+    LS_LONG    = 9
   };
 
 extern void