diff options
author | mainzer <mainzer#hdfgroup.org> | 2020-08-13 16:31:16 (GMT) |
---|---|---|
committer | mainzer <mainzer#hdfgroup.org> | 2020-08-13 16:31:16 (GMT) |
commit | 32024169364ddf031df8da879c45c3647a4d6135 (patch) | |
tree | 1dc1fa889c8ddba83b9794734e7d7e67b8fe7ab6 /src/H5T.c | |
parent | 33f35183cbfdde70ee8f803acb5b735ad4dfe086 (diff) | |
parent | e291fd31fd480dc4900d056e0e08df002e85a3f2 (diff) | |
download | hdf5-32024169364ddf031df8da879c45c3647a4d6135.zip hdf5-32024169364ddf031df8da879c45c3647a4d6135.tar.gz hdf5-32024169364ddf031df8da879c45c3647a4d6135.tar.bz2 |
Merge branch 'develop' into mdc_sl_opt
Diffstat (limited to 'src/H5T.c')
-rw-r--r-- | src/H5T.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -5718,9 +5718,9 @@ H5T_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc) break; case H5T_VLEN: /* Recurse on the VL information if it's VL, compound or array, then free VL sequence */ - /* Recurse if it's VL, compound, enum or array */ + /* Recurse if it's VL, compound, enum or array (ignore references here so that we can encode them as part of the same blob)*/ /* (If the force_conv flag is _not_ set, the type cannot change in size, so don't recurse) */ - if(dt->shared->parent->shared->force_conv && H5T_IS_COMPLEX(dt->shared->parent->shared->type)) { + if(dt->shared->parent->shared->force_conv && H5T_IS_COMPLEX(dt->shared->parent->shared->type) && (dt->shared->parent->shared->type != H5T_REFERENCE)) { if((changed = H5T_set_loc(dt->shared->parent, file, loc)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "Unable to set VL location"); if(changed > 0) |