diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2016-02-10 17:54:15 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-02-10 17:54:15 (GMT) |
commit | 4da0790886dd7f52d9bd01ef5d9191f7ff729b3e (patch) | |
tree | ae7f4cdfe0fce4207bc2d8f8720152305fba80bc /src/H5Ddeprec.c | |
parent | 745513e2b039515ccec52397cf7d1d807890bc9e (diff) | |
download | hdf5-4da0790886dd7f52d9bd01ef5d9191f7ff729b3e.zip hdf5-4da0790886dd7f52d9bd01ef5d9191f7ff729b3e.tar.gz hdf5-4da0790886dd7f52d9bd01ef5d9191f7ff729b3e.tar.bz2 |
[svn-r29076] Description:
Normalize against the phdf5_metadata_opt branch, in preparation for
merging it to trunk.
Tested on:
MacOSX/64 10.11.3 (amazon) w/serial, parallel, and production builds
h5committest forthcoming
Diffstat (limited to 'src/H5Ddeprec.c')
-rw-r--r-- | src/H5Ddeprec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index c5d6929..82545c1 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -179,8 +179,6 @@ H5Dopen1(hid_t loc_id, const char *name) { H5D_t *dset = NULL; H5G_loc_t loc; /* Object location of group */ - hid_t dapl_id = H5P_DATASET_ACCESS_DEFAULT; /* dapl to use to open dataset */ - hid_t dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datset */ hid_t ret_value; FUNC_ENTER_API(FAIL) @@ -193,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, dapl_id, dxpl_id))) + if(NULL == (dset = H5D__open_name(&loc, name, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open dataset") /* Register an atom for the dataset */ |