diff src/ov-struct.cc @ 4696:fcab389ad291

[project @ 2004-01-15 02:11:59 by jwe]
author jwe
date Thu, 15 Jan 2004 02:11:59 +0000
parents e95c86d48732
children 7dcb696159ac
line wrap: on
line diff
--- a/src/ov-struct.cc
+++ b/src/ov-struct.cc
@@ -722,8 +722,17 @@
   herr_t retval2;
   Octave_map m;
   int current_item = 0;
+#ifdef HAVE_H5GGET_NUM_OBJS
+  hsize_t num_obj = 0;
+  H5Gget_num_objs (loc_id, &num_obj);
+
+  while (current_item < static_cast<int> (num_obj)
+	 && (retval2 = H5Giterate (loc_id, name, &current_item,
+				   hdf5_read_next_data, &dsub)) > 0)
+#else
   while ((retval2 = H5Giterate (loc_id, name, &current_item,
 				hdf5_read_next_data, &dsub)) > 0)
+#endif
     {
       m.assign (dsub.name, dsub.tc);