diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-10 20:19:35 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-10 20:19:35 (GMT) |
| commit | 45f6d4c1eed29c45476970a9703304378a5a1073 (patch) | |
| tree | 667240a5ea57e8a072bc8ffb59ecb7281867164c /src/H5Iprivate.h | |
| parent | ad4b4b2b90c340bb408ddf32dd5cae780547bad2 (diff) | |
| parent | 09fa6e9c54380362f6f283ad60daef679ec91b25 (diff) | |
| download | hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.zip hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.tar.gz hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.tar.bz2 | |
[svn-r22274] merge from trunk, resolve conflicts
Diffstat (limited to 'src/H5Iprivate.h')
| -rw-r--r-- | src/H5Iprivate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h index 3a9e2db..ee938df 100644 --- a/src/H5Iprivate.h +++ b/src/H5Iprivate.h @@ -70,7 +70,7 @@ 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 void *H5I_search(H5I_type_t type, H5I_search_func_t func, void *key, hbool_t app_ref); +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); |