diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-05-14 09:46:12 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-05-14 09:46:12 (GMT) |
| commit | 6266d0fe88bbb6c823bda15295e583643b7204bf (patch) | |
| tree | e1b1f3e6ee65ab3b05a444c755193995f716564a /src/H5Aint.c | |
| parent | 776628b873facb34616ae63d16a2b79ccd5bd283 (diff) | |
| download | hdf5-6266d0fe88bbb6c823bda15295e583643b7204bf.zip hdf5-6266d0fe88bbb6c823bda15295e583643b7204bf.tar.gz hdf5-6266d0fe88bbb6c823bda15295e583643b7204bf.tar.bz2 | |
Manual merge of H5T_copy constification (avoids VOL changes and
messy diff).
Diffstat (limited to 'src/H5Aint.c')
| -rw-r--r-- | src/H5Aint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Aint.c b/src/H5Aint.c index 50e7fc5..dde60fa 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -221,7 +221,7 @@ H5A__create(const H5G_loc_t *loc, const char *name, const H5T_t *type, HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, NULL, "can't set version of dataspace") /* Copy the object header information */ - if(H5O_loc_copy(&(attr->oloc), loc->oloc, H5_COPY_DEEP) < 0) + if(H5O_loc_copy_deep(&(attr->oloc), loc->oloc) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "unable to copy entry") /* Deep copy of the group hierarchy path */ @@ -387,7 +387,7 @@ H5A__open_common(const H5G_loc_t *loc, H5A_t *attr) HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release group hier. path") /* Deep copy of the symbol table entry */ - if(H5O_loc_copy(&(attr->oloc), loc->oloc, H5_COPY_DEEP) < 0) + if(H5O_loc_copy_deep(&(attr->oloc), loc->oloc) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to copy entry") /* Deep copy of the group hier. path */ @@ -906,7 +906,7 @@ H5A__get_type(H5A_t *attr) * reopen the type before returning it to the user. Make the type * read-only. */ - if (NULL == (dt = H5T_copy(attr->shared->dt, H5T_COPY_REOPEN))) + if (NULL == (dt = H5T_copy_reopen(attr->shared->dt))) HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, H5I_INVALID_HID, "unable to copy datatype") /* Mark any datatypes as being in memory now */ |