diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2018-10-12 18:24:08 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2018-10-12 18:24:08 (GMT) |
| commit | 1e8ef703cdc057211b3587be776a6e9f62e8f76f (patch) | |
| tree | 4062ad929c38f1936adf38fc290150a26c9bc328 /src | |
| parent | bb9e268782b12c9f731632362363082abe0e80b5 (diff) | |
| parent | b0b9eda809282f362eb0e49bebd2956ba5a11bbc (diff) | |
| download | hdf5-1e8ef703cdc057211b3587be776a6e9f62e8f76f.zip hdf5-1e8ef703cdc057211b3587be776a6e9f62e8f76f.tar.gz hdf5-1e8ef703cdc057211b3587be776a6e9f62e8f76f.tar.bz2 | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5F.c | 2 | ||||
| -rw-r--r-- | src/H5Fpkg.h | 1 |
2 files changed, 0 insertions, 3 deletions
@@ -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; diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index f8ab5a9..e97144f 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -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; /*****************************/ |