diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-08-27 20:28:55 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-08-27 20:28:55 (GMT) |
| commit | 477bd6cd77d931bffaaed707fd1f4d43f19d44ab (patch) | |
| tree | 8603197ecba1650618bd4888aa6787204e60daff | |
| parent | 89928e7c212a718e3d85d106733e415b7fb52d8c (diff) | |
| parent | 7dfe1769248d7f05ded66b4c6b78cb0be5ebee52 (diff) | |
| download | hdf5-477bd6cd77d931bffaaed707fd1f4d43f19d44ab.zip hdf5-477bd6cd77d931bffaaed707fd1f4d43f19d44ab.tar.gz hdf5-477bd6cd77d931bffaaed707fd1f4d43f19d44ab.tar.bz2 | |
Merge branch 'develop_minor_pr' into H5Pset_fapl_mpi
| -rw-r--r-- | src/H5system.c | 2 | ||||
| -rw-r--r-- | testpar/t_cache_image.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/H5system.c b/src/H5system.c index 1d47d13..384360d 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -631,7 +631,7 @@ Pflock(int fd, int operation) { flk.l_pid = 0; /* not used with set */ /* Lock or unlock */ - if(HDfcntl(fd, F_SETLK, flk) < 0) + if(HDfcntl(fd, F_SETLK, &flk) < 0) return -1; return 0; diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c index e0c8211..14e3d10 100644 --- a/testpar/t_cache_image.c +++ b/testpar/t_cache_image.c @@ -1187,7 +1187,7 @@ open_hdf5_file(const hbool_t create_file, } else { - file_ptr = (struct H5F_t *)H5I_object_verify(file_id, H5I_FILE); + file_ptr = (struct H5F_t *)H5VL_object_verify(file_id, H5I_FILE); if ( file_ptr == NULL ) { |