diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-16 18:04:11 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-16 18:04:11 (GMT) |
| commit | 366f0151ddf63b0a08c4cef7f295d78d9ecd117d (patch) | |
| tree | 2bcff4c4f4e8c4caa5dbd890ab441682a75f62bd /src/H5Iprivate.h | |
| parent | adb2fd1cc0858602046959689377dbdb60a4c3a6 (diff) | |
| parent | 370e6f3f56bafa13c19eaa292a16929a8b918120 (diff) | |
| download | hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.zip hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.tar.gz hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.tar.bz2 | |
[svn-r24301] merge from trunk.
resolve conflicts, etc...
Diffstat (limited to 'src/H5Iprivate.h')
| -rw-r--r-- | src/H5Iprivate.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h index fe07ced..4c3457c 100644 --- a/src/H5Iprivate.h +++ b/src/H5Iprivate.h @@ -48,7 +48,6 @@ typedef struct H5I_class_t { H5I_type_t type_id; /* Class ID for the type */ unsigned flags; /* Class behavior flags */ - size_t hash_size; /* Minimum hash table size for the type */ unsigned reserved; /* Number of reserved IDs for this type */ /* [A specific number of type entries may be * reserved to enable "constant" values to be @@ -72,7 +71,6 @@ typedef struct H5I_class_t { H5_DLL herr_t H5I_register_type(const H5I_class_t *cls); H5_DLL int H5I_nmembers(H5I_type_t type); H5_DLL herr_t H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref); -H5_DLL int H5I_destroy_type(H5I_type_t type); H5_DLL hid_t H5I_register(H5I_type_t type, const void *object, hbool_t app_ref); H5_DLL hid_t H5I_register2(H5I_type_t type, const void *object, const void* aux_object, hbool_t app_ref); H5_DLL void *H5I_subst(hid_t id, const void *new_object); @@ -81,16 +79,13 @@ H5_DLL void *H5I_object_verify(hid_t id, H5I_type_t id_type); H5_DLL H5I_type_t H5I_get_type(hid_t id); H5_DLL hid_t H5I_get_file_id(hid_t obj_id, hbool_t app_ref); H5_DLL void *H5I_remove(hid_t id); -H5_DLL void *H5I_remove_verify(hid_t id, H5I_type_t id_type); H5_DLL herr_t H5I_iterate(H5I_type_t type, H5I_search_func_t func, void *udata, hbool_t app_ref); H5_DLL int H5I_get_ref(hid_t id, hbool_t app_ref); H5_DLL int H5I_inc_ref(hid_t id, hbool_t app_ref); H5_DLL int H5I_dec_ref(hid_t id); H5_DLL int H5I_dec_app_ref(hid_t id); H5_DLL int H5I_dec_app_ref_always_close(hid_t id); -H5_DLL int H5I_inc_type_ref(H5I_type_t type); H5_DLL herr_t H5I_dec_type_ref(H5I_type_t type); -H5_DLL int H5I_get_type_ref(H5I_type_t type); H5_DLL herr_t H5I_register_aux(hid_t id, void *aux_ptr); H5_DLL void *H5I_get_aux(hid_t id); H5_DLL hid_t H5I_get_id(void *object, H5I_type_t type); |