Merge pull request #1294 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop

* commit 'b0b9eda809282f362eb0e49bebd2956ba5a11bbc':
  Fixed a C++ style commenting issue and removed an unused field from H5F_trav_obj_ids_t.
This commit is contained in:
Dana Robinson 2018-10-12 13:24:08 -05:00
commit 1e8ef703cd
2 changed files with 0 additions and 3 deletions

View File

@ -477,8 +477,6 @@ H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *oid_list)
else {
H5F_trav_obj_ids_t udata;
/* XXX (VOL MERGE): Unclear why this is commented out */
//udata.types = types | H5F_OBJ_LOCAL;
udata.max_objs = max_objs;
udata.oid_list = oid_list;
udata.obj_count = &ret_value;

View File

@ -418,7 +418,6 @@ typedef struct {
size_t max_objs;
hid_t *oid_list;
ssize_t *obj_count; /* number of objects counted so far */
unsigned types; /* types of objects to be counted */
} H5F_trav_obj_ids_t;
/*****************************/