diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-10-09 20:45:26 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-10-09 20:45:26 (GMT) |
| commit | 984c1bacd93c2f782c75c02d88d6e5c0362c74d0 (patch) | |
| tree | 97bf7d8b15caee53eb8fdfd84eb09316b54903f1 /src/H5Oprivate.h | |
| parent | 19c2eb2800a48d0bd5a8af7757e21cc5cd22fa3c (diff) | |
| parent | 5d2545ee26d4b7013ed363545705f16a67087549 (diff) | |
| download | hdf5-984c1bacd93c2f782c75c02d88d6e5c0362c74d0.zip hdf5-984c1bacd93c2f782c75c02d88d6e5c0362c74d0.tar.gz hdf5-984c1bacd93c2f782c75c02d88d6e5c0362c74d0.tar.bz2 | |
Merge pull request #1990 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5:references_1_12 to hdf5_1_12
* commit '5d2545ee26d4b7013ed363545705f16a67087549':
Fix func enter macro in H5T_ref_reclaim()
Update RELEASE.txt for reference changes
Fix reference type comparison in h5dump
Make wrappers, tests and tools use H5Treclaim() instead of H5Dvlen_reclaim()
Add new H5R API that abstracts object, region and attribute reference types
Remove ability to loc by ref from H5VL layer
Add support for retrieving object name by token
Add H5VL_OBJECT_GET_TYPE to get object type
Add H5VL_MAX_TOKEN_SIZE and H5VL_token_t
Adapt Jerome's "file info" H5VL 'get' query to retrieve container token info.
Fix H5VL_blob_get to return size of blob
Add 'blob' callbacks to VOL, along with a native implementation to store them in the global heap, and changed the VL datatype conversion code to use blobs.
Diffstat (limited to 'src/H5Oprivate.h')
| -rw-r--r-- | src/H5Oprivate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 354a00b..5f34fcd 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -976,8 +976,8 @@ H5_DLL herr_t H5O_refresh_metadata_reopen(hid_t oid, H5G_loc_t *obj_loc, H5VL_t H5_DLL herr_t H5O_copy_header_map(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, H5O_copy_t *cpy_info, hbool_t inc_depth, H5O_type_t *obj_type, void **udata); -H5_DLL herr_t H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, - H5F_t *file_dst, void *_dst_ref, size_t ref_count, H5R_type_t ref_type, +H5_DLL herr_t H5O_copy_expand_ref(H5F_t *file_src, hid_t tid_src, H5T_t *dt_src, + void *buf_src, size_t nbytes_src, H5F_t *file_dst, void *buf_dst, H5O_copy_t *cpy_info); H5_DLL herr_t H5O_copy(const H5G_loc_t *src_loc, const char *src_name, H5G_loc_t *dst_loc, const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id); |