diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2018-12-18 19:53:02 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2018-12-18 19:53:02 (GMT) |
commit | b486fd10a44df052c8c2f030ab8c2c25dfa0f8a2 (patch) | |
tree | 333ba43551a7cbaae446299c04c4d52c63eccd07 /src/H5Fint.c | |
parent | f0c83dedb64082dcbce3012e99fcb77dc1d96d1b (diff) | |
parent | 70c8c629ce1d7b1eb98220135ddcca1bf9c5b7fc (diff) | |
download | hdf5-b486fd10a44df052c8c2f030ab8c2c25dfa0f8a2.zip hdf5-b486fd10a44df052c8c2f030ab8c2c25dfa0f8a2.tar.gz hdf5-b486fd10a44df052c8c2f030ab8c2c25dfa0f8a2.tar.bz2 |
Merge pull request #1392 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_optional_enum_to_macros to develop
* commit '70c8c629ce1d7b1eb98220135ddcca1bf9c5b7fc':
Added missing H5O calls.
Fixed a missing H5R call.
Made hbool_t processing consistent in va_lists.
Fixed an enums-in-va_list issue in the passthru VOL connector.
Updated enums in VOL va_lists to be passed as ints.
Diffstat (limited to 'src/H5Fint.c')
-rw-r--r-- | src/H5Fint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c index b212657..c0a9dc3 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -3701,7 +3701,7 @@ H5F_get_file_id(hid_t obj_id, H5I_type_t type) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid identifier") /* Get the file through the VOL */ - if(H5VL_file_optional(vol_obj, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_NATIVE_FILE_GET_FILE_ID, type, &file_id) < 0) + if(H5VL_file_optional(vol_obj, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_NATIVE_FILE_GET_FILE_ID, (int)type, &file_id) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, H5I_INVALID_HID, "unable to get file ID") if(H5I_INVALID_HID == file_id) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, H5I_INVALID_HID, "unable to get the file ID through the VOL") |