diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2016-02-10 20:48:34 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2016-02-10 20:48:34 (GMT) |
commit | 63c90e5c67445de5deaaf45b70273fef1286ae60 (patch) | |
tree | 97f30fd46663aa809ac03bb4feac32bed9b12ee5 /src/H5Ddeprec.c | |
parent | 4da0790886dd7f52d9bd01ef5d9191f7ff729b3e (diff) | |
parent | 557a3972ac65f4d0d40f73b5add3195b739ea5cc (diff) | |
download | hdf5-63c90e5c67445de5deaaf45b70273fef1286ae60.zip hdf5-63c90e5c67445de5deaaf45b70273fef1286ae60.tar.gz hdf5-63c90e5c67445de5deaaf45b70273fef1286ae60.tar.bz2 |
[svn-r29081] - merge in the phdf5_metadata_opt/ branch with the collective metadata optimizations.
- rename H5AC_dxpl_id to H5AC_ind_read_dxpl_id and update all usage in the library
tested on bb-8 with parallel and serial.
Diffstat (limited to 'src/H5Ddeprec.c')
-rw-r--r-- | src/H5Ddeprec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index 82545c1..c6a03c2 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -141,7 +141,7 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID") /* Build and open the new dataset */ - if(NULL == (dset = H5D__create_named(&loc, name, type_id, space, H5P_LINK_CREATE_DEFAULT, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id))) + if(NULL == (dset = H5D__create_named(&loc, name, type_id, space, H5P_LINK_CREATE_DEFAULT, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, H5AC_ind_read_dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset") /* Register the new dataset to get an ID for it */ @@ -191,7 +191,7 @@ H5Dopen1(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Open the dataset */ - if(NULL == (dset = H5D__open_name(&loc, name, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id))) + if(NULL == (dset = H5D__open_name(&loc, name, H5P_DATASET_ACCESS_DEFAULT, H5AC_ind_read_dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open dataset") /* Register an atom for the dataset */ @@ -239,7 +239,7 @@ H5Dextend(hid_t dset_id, const hsize_t size[]) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified") /* Increase size */ - if(H5D__extend(dset, size, H5AC_dxpl_id) < 0) + if(H5D__extend(dset, size, H5AC_ind_read_dxpl_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to extend dataset") done: |