Mercurial > hg > octave-nkf

comparison src/ov-struct.cc @ 5336:6ba182a85dea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-05-04 18:12:16 by jwe]
author jwe
date Wed, 04 May 2005 18:12:17 +0000
parents 4c8a2e4e0717
children 4bea82210dcd
comparison
equal deleted inserted replaced
5335:a892ee7ac114 5336:6ba182a85dea
1024 = read_ascii_data (is, std::string (), dummy, t2, count); 1024 = read_ascii_data (is, std::string (), dummy, t2, count);
1025 1025
1026 if (!is) 1026 if (!is)
1027 break; 1027 break;
1028 1028
1029 m.assign (nm, t2); 1029 Cell tcell = t2.cell_value ();
1030
1031 if (error_state)
1032 {
1033 error ("load: internal error loading struct elements");
1034 return false;
1035 }
1036
1037 m.assign (nm, tcell);
1030 } 1038 }
1031 1039
1032 if (is) 1040 if (is)
1033 map = m; 1041 map = m;
1034 else 1042 else
1101 dummy, t2, doc); 1109 dummy, t2, doc);
1102 1110
1103 if (!is) 1111 if (!is)
1104 break; 1112 break;
1105 1113
1106 m.assign (nm, t2); 1114 Cell tcell = t2.cell_value ();
1115
1116 if (error_state)
1117 {
1118 error ("load: internal error loading struct elements");
1119 return false;
1120 }
1121
1122 m.assign (nm, tcell);
1107 } 1123 }
1108 1124
1109 if (is) 1125 if (is)
1110 map = m; 1126 map = m;
1111 else 1127 else
1177 #else 1193 #else
1178 while ((retval2 = H5Giterate (loc_id, name, &current_item, 1194 while ((retval2 = H5Giterate (loc_id, name, &current_item,
1179 hdf5_read_next_data, &dsub)) > 0) 1195 hdf5_read_next_data, &dsub)) > 0)
1180 #endif 1196 #endif
1181 { 1197 {
1182 m.assign (dsub.name, dsub.tc); 1198 Cell tcell = dsub.tc.cell_value ();
1199
1200 if (error_state)
1201 {
1202 error ("load: internal error loading struct elements");
1203 return false;
1204 }
1205
1206 m.assign (dsub.name, tcell);
1183 1207
1184 if (have_h5giterate_bug) 1208 if (have_h5giterate_bug)
1185 current_item++; // H5Giterate returned the last index processed 1209 current_item++; // H5Giterate returned the last index processed
1186 } 1210 }
1187 1211