diff options
| author | Richard Warren <Richard.Warren@hdfgroup.org> | 2019-12-06 21:42:36 (GMT) |
|---|---|---|
| committer | Richard Warren <Richard.Warren@hdfgroup.org> | 2019-12-06 21:42:36 (GMT) |
| commit | 0c06cfc6ef9d851908f1017881598628ddf70b2a (patch) | |
| tree | 0046503ba9371adcf6ad33a307d6e6827e52d88a /src/H5Aint.c | |
| parent | 9d24eefaf71bae79ab3e483a608ddb8deff17b39 (diff) | |
| download | hdf5-0c06cfc6ef9d851908f1017881598628ddf70b2a.zip hdf5-0c06cfc6ef9d851908f1017881598628ddf70b2a.tar.gz hdf5-0c06cfc6ef9d851908f1017881598628ddf70b2a.tar.bz2 | |
Merged HDFFV-10929_2GB_testing to hdf5_1_12
Diffstat (limited to 'src/H5Aint.c')
| -rw-r--r-- | src/H5Aint.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Aint.c b/src/H5Aint.c index f9ae009..436fced 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -109,6 +109,7 @@ const unsigned H5O_attr_ver_bounds[] = { H5O_ATTR_VERSION_1, /* H5F_LIBVER_EARLIEST */ H5O_ATTR_VERSION_3, /* H5F_LIBVER_V18 */ H5O_ATTR_VERSION_3, /* H5F_LIBVER_V110 */ + H5O_ATTR_VERSION_3, /* H5F_LIBVER_V112 */ H5O_ATTR_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; @@ -207,7 +208,7 @@ H5A__create(const H5G_loc_t *loc, const char *attr_name, const H5T_t *type, HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "can't get shared datatype info") /* Mark datatype as being on disk now */ - if(H5T_set_loc(attr->shared->dt, loc->oloc->file, H5T_LOC_DISK) < 0) + if(H5T_set_loc(attr->shared->dt, H5F_VOL_OBJ(loc->oloc->file), H5T_LOC_DISK) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid datatype location") /* Set the version for datatype */ @@ -2114,7 +2115,7 @@ H5A__attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_s HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "cannot copy datatype") /* Set the location of the destination datatype */ - if(H5T_set_loc(attr_dst->shared->dt, file_dst, H5T_LOC_DISK) < 0) + if(H5T_set_loc(attr_dst->shared->dt, H5F_VOL_OBJ(file_dst), H5T_LOC_DISK) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "cannot mark datatype on disk") if(!H5T_is_named(attr_src->shared->dt)) { |