# HG changeset patch
# User jwe
# Date 1115400941 0
# Node ID f9ab8e67ce7a8cd1c967761c8905682cd78b7c10
# Parent  4bea82210dcd25db96a112c295f660ab26204023
[project @ 2005-05-06 17:35:41 by jwe]

diff -r 4bea82210dcd -r f9ab8e67ce7a src/ChangeLog
--- a/src/ChangeLog	Fri May 06 17:11:47 2005 +0000
+++ b/src/ChangeLog	Fri May 06 17:35:41 2005 +0000
@@ -3,6 +3,8 @@
 	* ov-struct.cc (octave_struct::save_ascii,
 	octave_struct::save_binary, octave_sruct::save_hdf5):
 	Always save cell array.
+	(octave_struct::load_ascii, octave_struct::load_binary,
+	octave_sruct::load_hdf5): Try to read old-style files correctly.
 
 	* DLD-FUNCTIONS/__qp__.cc (qp): Use chol2inv to compute inverse
 	from Cholesky factors.
diff -r 4bea82210dcd -r f9ab8e67ce7a src/ov-struct.cc
--- a/src/ov-struct.cc	Fri May 06 17:11:47 2005 +0000
+++ b/src/ov-struct.cc	Fri May 06 17:35:41 2005 +0000
@@ -1025,7 +1025,8 @@
 	      if (!is)
 		break;
 
-	      Cell tcell = t2.cell_value ();
+	      // Try for some backward compatibility...
+	      Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);
 
 	      if (error_state)
 		{
@@ -1109,7 +1110,8 @@
 	  if (!is)
 	    break;
 
-	  Cell tcell = t2.cell_value ();
+	  // Try for some backward compatibility...
+	  Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);
 
 	  if (error_state)
 	    {
@@ -1192,7 +1194,10 @@
 				hdf5_read_next_data, &dsub)) > 0)
 #endif
     {
-      Cell tcell = dsub.tc.cell_value ();
+      octave_value t2 = dsub.tc;
+
+      // Try for some backward compatibility...
+      Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);
 
       if (error_state)
 	{