diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2011-10-14 00:03:09 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2011-10-14 00:03:09 (GMT) |
| commit | 363988bd77243b36c6324734b3a985c4fe07f650 (patch) | |
| tree | fb23cc6accc028589d934362d56fad83a7e3b947 /src/H5A.c | |
| parent | 682a4f2b5d383d6abf6741a4a5a573f1c67e668e (diff) | |
| download | hdf5-363988bd77243b36c6324734b3a985c4fe07f650.zip hdf5-363988bd77243b36c6324734b3a985c4fe07f650.tar.gz hdf5-363988bd77243b36c6324734b3a985c4fe07f650.tar.bz2 | |
[svn-r21557] Port r21556 to 1.8 branch
Purpose: Fix bug in H5Ocopy
Description:
H5Ocopy could get confused when copying a named datatype containing an
attribute which used that named datatype as its datatype. This happened
because H5Ocopy would recurse into the attribute's datatype before the object
the attribute was in was fully copied (i.e. before the "post-copy" pass).
Modified H5Ocopy to avoid recursing before the post-copy step in this case.
Required many changes, including to how non-committed shared messages are
copied.
Tested: jam, koala, heiwa (h5committest); durandal
Diffstat (limited to 'src/H5A.c')
| -rw-r--r-- | src/H5A.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -451,9 +451,9 @@ H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type, /* Check if any of the pieces should be (or are already) shared in the * SOHM table */ - if(H5SM_try_share(attr->oloc.file, dxpl_id, NULL, H5O_DTYPE_ID, attr->shared->dt, NULL) < 0) + if(H5SM_try_share(attr->oloc.file, dxpl_id, NULL, FALSE, H5O_DTYPE_ID, attr->shared->dt, NULL) < 0) HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "trying to share datatype failed") - if(H5SM_try_share(attr->oloc.file, dxpl_id, NULL, H5O_SDSPACE_ID, attr->shared->ds, NULL) < 0) + if(H5SM_try_share(attr->oloc.file, dxpl_id, NULL, FALSE, H5O_SDSPACE_ID, attr->shared->ds, NULL) < 0) HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "trying to share dataspace failed") /* Check whether datatype is committed & increment ref count |