[svn-r25471] merge from trunk and resolve conflicts.

1 files changed, 0 insertions, 7 deletions

diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index c8cbb83..009dcd7 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -602,14 +602,7 @@ typedef struct H5F_io_info_t {
 /* Private functions */
 H5_DLL H5F_t *H5F_open(const char *name, unsigned flags, hid_t fcpl_id,
     hid_t fapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5F_close(H5F_t *f);
 H5_DLL herr_t H5F_try_close(H5F_t *f);
-H5_DLL H5F_t *H5F_reopen(H5F_t *f);
-H5_DLL htri_t H5F_is_hdf5(const char *name);
-H5_DLL herr_t H5F_get_objects(const H5F_t *f, unsigned types, size_t max_index, hid_t *obj_id_list, hbool_t app_ref, size_t *obj_id_count_ptr);
-H5_DLL int H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key);
-H5_DLL int H5F_get_obj_count_cb(void *obj_ptr, hid_t obj_id, void *key);
-H5_DLL int H5F_get_obj_ids_cb(void *obj_ptr, hid_t obj_id, void *key);
 
 /* Functions than retrieve values from the file struct */
 H5_DLL unsigned H5F_get_intent(const H5F_t *f);