diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2016-02-07 16:38:55 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2016-02-07 16:38:55 (GMT) |
| commit | 0461830ee3a7eea419fbb6629c47e40c27aaf6f8 (patch) | |
| tree | c4955c2febb9606bb68f803276b79503ba3f7a00 /src/H5Dscatgath.c | |
| parent | c3f08947c1fbca8f6ccd87ca35f0f23b6209b129 (diff) | |
| parent | 48bebcc39ef565796356c159d16f09bfb0efba4d (diff) | |
| download | hdf5-0461830ee3a7eea419fbb6629c47e40c27aaf6f8.zip hdf5-0461830ee3a7eea419fbb6629c47e40c27aaf6f8.tar.gz hdf5-0461830ee3a7eea419fbb6629c47e40c27aaf6f8.tar.bz2 | |
[svn-r29059] merge from trunk.
Diffstat (limited to 'src/H5Dscatgath.c')
| -rw-r--r-- | src/H5Dscatgath.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c index 9902b7b..7c1abca 100644 --- a/src/H5Dscatgath.c +++ b/src/H5Dscatgath.c @@ -538,7 +538,7 @@ H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf */ if(H5T_convert(type_info->tpath, type_info->src_type_id, type_info->dst_type_id, smine_nelmts, (size_t)0, (size_t)0, type_info->tconv_buf, - type_info->bkg_buf, io_info->dxpl_id) < 0) + type_info->bkg_buf, io_info->md_dxpl_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed") /* Do the data transform after the conversion (since we're using type mem_type) */ @@ -674,7 +674,7 @@ H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_in */ if(H5T_convert(type_info->tpath, type_info->src_type_id, type_info->dst_type_id, smine_nelmts, (size_t)0, (size_t)0, type_info->tconv_buf, - type_info->bkg_buf, io_info->dxpl_id) < 0) + type_info->bkg_buf, io_info->md_dxpl_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed") } /* end else */ @@ -948,7 +948,7 @@ H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination buffer provided") /* Fill the DXPL cache values for later use */ - if(H5D__get_dxpl_cache(H5P_DATASET_XFER_DEFAULT, &dxpl_cache) < 0) + if(H5D__get_dxpl_cache(H5AC_noio_dxpl_id, &dxpl_cache) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache") /* Get datatype element size */ @@ -1050,7 +1050,7 @@ H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination buffer provided") /* Fill the DXPL cache values for later use */ - if(H5D__get_dxpl_cache(H5P_DATASET_XFER_DEFAULT, &dxpl_cache) < 0) + if(H5D__get_dxpl_cache(H5AC_noio_dxpl_id, &dxpl_cache) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache") /* Get datatype element size */ |