diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2018-10-18 21:05:40 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2018-10-18 21:05:40 (GMT) |
commit | 4e575a086553a23fc79d3e92f48eb9508711e6ca (patch) | |
tree | e3160ca419ba617d90cb89634376e9a17260c5de /src/H5R.c | |
parent | a82aee9a5fb4b10951d95a0422a4125b18fe9a52 (diff) | |
parent | 2d6d5cad0cc426cd53b9d4fda15e53d8021e4c7b (diff) | |
download | hdf5-4e575a086553a23fc79d3e92f48eb9508711e6ca.zip hdf5-4e575a086553a23fc79d3e92f48eb9508711e6ca.tar.gz hdf5-4e575a086553a23fc79d3e92f48eb9508711e6ca.tar.bz2 |
Merge pull request #1297 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '2d6d5cad0cc426cd53b9d4fda15e53d8021e4c7b':
Updates to the VOL ID and object API calls.
Diffstat (limited to 'src/H5R.c')
-rw-r--r-- | src/H5R.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -189,7 +189,7 @@ H5Rdereference2(hid_t obj_id, hid_t oapl_id, H5R_type_t ref_type, const void *_r HGOTO_ERROR(H5E_REFERENCE, H5E_CANTSET, FAIL, "can't set access property list info") /* Get the VOL object */ - if(NULL == (vol_obj = H5VL_get_object(obj_id))) + if(NULL == (vol_obj = H5VL_vol_object(obj_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid file identifier") /* Set location parameters */ @@ -204,7 +204,7 @@ H5Rdereference2(hid_t obj_id, hid_t oapl_id, H5R_type_t ref_type, const void *_r &opened_type, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL))) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTOPENOBJ, H5I_INVALID_HID, "unable to dereference object") - if((ret_value = H5VL_register_id(opened_type, opened_obj, vol_obj->driver, TRUE)) < 0) + if((ret_value = H5VL_register(opened_type, opened_obj, vol_obj->driver, TRUE)) < 0) HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register object handle") done: |