diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-08-15 21:30:24 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-08-15 21:30:24 (GMT) |
| commit | 2f895fe96a372e72e08a0e5227a524302e6799d1 (patch) | |
| tree | 782edef94e0d9701f2de67c11a7e2d137d455fea /src/H5Ppublic.h | |
| parent | 59316d1327380e619f7a7e4d215d55e88f8c1c74 (diff) | |
| parent | c638d93f3e660ce669a36e50a02473aac126953d (diff) | |
| download | hdf5-2f895fe96a372e72e08a0e5227a524302e6799d1.zip hdf5-2f895fe96a372e72e08a0e5227a524302e6799d1.tar.gz hdf5-2f895fe96a372e72e08a0e5227a524302e6799d1.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'c638d93f3e660ce669a36e50a02473aac126953d':
Fixes missing chunk_info entry in CMake files
Even more normalization with develop
More normalizations with develop
Misc normalizations with develop
Normalization of perform directory with develop
Brings monotonic timer changes from develop
Brings Mirror VFD to 1.10 from develop
Brings splitter VFD from develop
Brings file locking changes from develop
Diffstat (limited to 'src/H5Ppublic.h')
| -rw-r--r-- | src/H5Ppublic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 5d6dea8..dbd0724 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -359,6 +359,8 @@ H5_DLL herr_t H5Pset_mdc_log_options(hid_t plist_id, hbool_t is_enabled, const c H5_DLL herr_t H5Pget_mdc_log_options(hid_t plist_id, hbool_t *is_enabled, char *location, size_t *location_size, hbool_t *start_on_access); H5_DLL herr_t H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close); H5_DLL herr_t H5Pget_evict_on_close(hid_t fapl_id, hbool_t *evict_on_close); +H5_DLL herr_t H5Pset_file_locking(hid_t fapl_id, hbool_t use_file_locking, hbool_t ignore_when_disabled); +H5_DLL herr_t H5Pget_file_locking(hid_t fapl_id, hbool_t *use_file_locking, hbool_t *ignore_when_disabled); #ifdef H5_HAVE_PARALLEL H5_DLL herr_t H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective); H5_DLL herr_t H5Pget_all_coll_metadata_ops(hid_t plist_id, hbool_t *is_collective); |