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/H5O.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/H5O.c')
| -rw-r--r-- | src/H5O.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -971,7 +971,7 @@ H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, loc_params.obj_type = H5I_get_type(obj_id); /* Visit the objects */ - if((ret_value = H5VL_object_specific(vol_obj, &loc_params, H5VL_OBJECT_VISIT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, idx_type, order, op, op_data, fields)) < 0) + if((ret_value = H5VL_object_specific(vol_obj, &loc_params, H5VL_OBJECT_VISIT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, (int)idx_type, (int)order, op, op_data, fields)) < 0) HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "object iteration failed") done: @@ -1055,7 +1055,7 @@ H5Ovisit_by_name2(hid_t loc_id, const char *obj_name, H5_index_t idx_type, loc_params.obj_type = H5I_get_type(loc_id); /* Visit the objects */ - if((ret_value = H5VL_object_specific(vol_obj, &loc_params, H5VL_OBJECT_VISIT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, idx_type, order, op, op_data, fields)) < 0) + if((ret_value = H5VL_object_specific(vol_obj, &loc_params, H5VL_OBJECT_VISIT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, (int)idx_type, (int)order, op, op_data, fields)) < 0) HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "object iteration failed") done: |