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/H5VLpassthru.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/H5VLpassthru.c')
| -rw-r--r-- | src/H5VLpassthru.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5VLpassthru.c b/src/H5VLpassthru.c index 49102d7..8b83e2e 100644 --- a/src/H5VLpassthru.c +++ b/src/H5VLpassthru.c @@ -1636,7 +1636,7 @@ H5VL_pass_through_file_specific(void *file, H5VL_file_specific_t specific_type, hid_t plist_id; /* Retrieve parameters for 'mount' operation, so we can unwrap the child file */ - loc_type = va_arg(arguments, H5I_type_t); + loc_type = (H5I_type_t)va_arg(arguments, int); /* enum work-around */ name = va_arg(arguments, const char *); child_file = (H5VL_pass_through_t *)va_arg(arguments, void *); plist_id = va_arg(arguments, hid_t); @@ -1645,7 +1645,7 @@ H5VL_pass_through_file_specific(void *file, H5VL_file_specific_t specific_type, under_vol_id = o->under_vol_id; /* Re-issue 'file specific' call, using the unwrapped pieces */ - ret_value = H5VL_pass_through_file_specific_reissue(o->under_object, o->under_vol_id, specific_type, dxpl_id, req, loc_type, name, child_file->under_object, plist_id); + ret_value = H5VL_pass_through_file_specific_reissue(o->under_object, o->under_vol_id, specific_type, dxpl_id, req, (int)loc_type, name, child_file->under_object, plist_id); } /* end if */ else if(specific_type == H5VL_FILE_IS_ACCESSIBLE) { H5VL_pass_through_info_t *info; |