diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2018-05-31 23:14:24 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2018-05-31 23:14:24 (GMT) |
| commit | dec2f588acad45eaa02061d7d28774e5c6915f70 (patch) | |
| tree | 5029cc9e0acf30aef5083e692574899f768c8d13 /hl/src/H5DOpublic.h | |
| parent | 1c7b0bc85713d4eafeb7c8157d6526b42826f0ca (diff) | |
| parent | 1da9c5545c013ebc540ba3044810889d4acfa5be (diff) | |
| download | hdf5-dec2f588acad45eaa02061d7d28774e5c6915f70.zip hdf5-dec2f588acad45eaa02061d7d28774e5c6915f70.tar.gz hdf5-dec2f588acad45eaa02061d7d28774e5c6915f70.tar.bz2 | |
Merge pull request #1043 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5do_direct_chunk_hl_to_src to develop
* commit '1da9c5545c013ebc540ba3044810889d4acfa5be':
Restored some unused #defines to the deprecated section of H5Dpublic.h.
Added deprecated symbol wrappers for the H5DOwrite/read_chunk wrappers.
Updated commenting in the H5DO compat test.
Stripped out most of the duplicated functionality in the H5DO compat test.
* Added H5DO compatibility functions. * Changed the offset copy to use an array on the stack. * Yanked some unused #defines.
* Fixed the error tests * Moved common functionality into helper functions
Normalize with trunk prior to update merge
Fixed a warning.
Finished move of H5DOread/write_chunk calls to H5D.
First stage of moving H5DOread/write_chunk() to src/ and making them H5D calls. * Moved H5DOread/write_chunk() to H5Dio.c and renamed to H5D*. * Moved the hl/test/test_dset_opt test to test/ and renamed to direct_chunk. * Moved the hl/test/dectris_hl_perf test to tools/test/perform and renamed to direct_write_perf. * Updated autotools and CMake files.
Diffstat (limited to 'hl/src/H5DOpublic.h')
| -rw-r--r-- | hl/src/H5DOpublic.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/hl/src/H5DOpublic.h b/hl/src/H5DOpublic.h index d5c8de4..e09ebca 100644 --- a/hl/src/H5DOpublic.h +++ b/hl/src/H5DOpublic.h @@ -25,18 +25,23 @@ extern "C" { *------------------------------------------------------------------------- */ -H5_HLDLL herr_t H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, - const hsize_t *offset, size_t data_size, const void *buf); - -H5_HLDLL herr_t H5DOread_chunk(hid_t dset_id, /*in*/ - hid_t dxpl_id, /*in*/ - const hsize_t *offset, /*in*/ - uint32_t *filters, /*out*/ - void *buf); /*out*/ - H5_HLDLL herr_t H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension, hid_t memtype, const void *buf); +/* Symbols defined for compatibility with previous versions of the HDF5 API. + * + * Use of these symbols is deprecated. + */ +#ifndef H5_NO_DEPRECATED_SYMBOLS + +/* Compatibility wrappers for functionality moved to H5D */ +H5_HLDLL herr_t H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, + const hsize_t *offset, size_t data_size, const void *buf); +H5_HLDLL herr_t H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, + uint32_t *filters /*out*/, void *buf /*out*/); + +#endif /* H5_NO_DEPRECATED_SYMBOLS */ + #ifdef __cplusplus } #endif |