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.

2 files changed, 0 insertions, 3 deletions

diff --git a/src/H5F.c b/src/H5F.c
index 9258830..2dcafb9 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -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;
 
 /*****************************/