octave-nkf: src/ls-mat5.cc comparison

[project @ 2003-12-16 05:11:26 by jwe]

comparison

equal deleted inserted replaced

-:7736835a5c8e
+:f6d6335c08f6
 	for (int j = n_fields-1; j >= 0; j--)
 	  {
 	    const char *key = elname + j*field_name_length;
+	    Cell c (dim_vector (n, 1));
 	    for (int k = n-1; k >=0; k--)
-	      m[key](k) = field_elts(j,k);
+	      c(k) = field_elts(j,k);
+	    m.assign (key, c);
 	  }
 	tc = m;
 }
 break;
 }
 else if (tc.is_map ())
 {
 // an Octave structure */
 // recursively write each element of the structure
-Octave_map m = tc.map_value ();
+const Octave_map m = tc.map_value ();
 {
 	char buf[32];
 	FOUR_BYTE_INT maxfieldnamelength = 32;
 	int fieldcnt = 0;
-	for (Octave_map::iterator i = m.begin (); i != m.end (); i++)
+	for (Octave_map::const_iterator i = m.begin (); i != m.end (); i++)
 	  fieldcnt++;
 	write_mat5_tag (os, miINT32, 4);
 	os.write ((char *)&maxfieldnamelength, 4);
 	write_mat5_tag (os, miINT8, fieldcnt*32);
-	for (Octave_map::iterator i = m.begin (); i != m.end (); i++)
+	for (Octave_map::const_iterator i = m.begin (); i != m.end (); i++)
 	  {
 	    // write the name of each element
 	    std::string tstr = m.key (i);
 	    memset (buf, 0, 32);
 	    strncpy (buf, tstr.c_str (), 31); // only 31 char names permitted
 	    os.write (buf, 32);
 	  }
 	int len = m.numel ();
-	for (Octave_map::iterator i = m.begin (); i != m.end (); i++)
+	for (Octave_map::const_iterator i = m.begin (); i != m.end (); i++)
 	  {
 	    // write the data of each element
 	    Cell elts = m.contents (i);
 	    for (int j = 0; j < len; j++)

Mercurial > octave-nkf