diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-05-11 19:11:04 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-05-11 19:11:04 (GMT) |
| commit | 5520ff138ca79bb5aa46146908773c910f767554 (patch) | |
| tree | c9ea17f4530c1eade235ea077f179d3557042233 /src/H5D.c | |
| parent | c3218d9f39ec281506251c2c6ba0b395adfa9013 (diff) | |
| parent | 67ba6cb57d84dd34c69930d469ae445697b49731 (diff) | |
| download | hdf5-5520ff138ca79bb5aa46146908773c910f767554.zip hdf5-5520ff138ca79bb5aa46146908773c910f767554.tar.gz hdf5-5520ff138ca79bb5aa46146908773c910f767554.tar.bz2 | |
[svn-r27050] merge from trunk.
Diffstat (limited to 'src/H5D.c')
| -rw-r--r-- | src/H5D.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -338,6 +338,7 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id) void *dset = NULL; /* dset token from VOL plugin */ H5VL_object_t *obj = NULL; /* object token of loc_id */ H5VL_loc_params_t loc_params; + hid_t dxpl_id = H5AC_ind_dxpl_id; /* dxpl to use to open datset */ hid_t ret_value; FUNC_ENTER_API(FAIL) @@ -363,7 +364,7 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id) /* Create the dataset through the VOL */ if(NULL == (dset = H5VL_dataset_open(obj->vol_obj, loc_params, obj->vol_info->vol_cls, name, - dapl_id, H5AC_dxpl_id, H5_REQUEST_NULL))) + dapl_id, dxpl_id, H5_REQUEST_NULL))) HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open dataset") /* Get an atom for the dataset */ @@ -372,7 +373,7 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id) done: if (ret_value < 0 && dset) - if(H5VL_dataset_close (dset, obj->vol_info->vol_cls, H5AC_dxpl_id, H5_REQUEST_NULL) < 0) + if(H5VL_dataset_close (dset, obj->vol_info->vol_cls, dxpl_id, H5_REQUEST_NULL) < 0) HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset") FUNC_LEAVE_API(ret_value) } /* end H5Dopen2() */ |