diff options
| author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2017-12-05 06:30:42 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2017-12-05 06:30:42 (GMT) |
| commit | 02d6a8b3ab923b386fd56816a18c6bf5640c4feb (patch) | |
| tree | f0010c85766ad78965e42e11f89132d4bde1c7de /src | |
| parent | ad6581194d7eddf27ff12496cb9d5c83ce3d6193 (diff) | |
| download | hdf5-02d6a8b3ab923b386fd56816a18c6bf5640c4feb.zip hdf5-02d6a8b3ab923b386fd56816a18c6bf5640c4feb.tar.gz hdf5-02d6a8b3ab923b386fd56816a18c6bf5640c4feb.tar.bz2 | |
Resolve conflicts from previous merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Rint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Rint.c b/src/H5Rint.c index 716a573..d9669c5 100644 --- a/src/H5Rint.c +++ b/src/H5Rint.c @@ -289,7 +289,7 @@ H5R_create(void *_ref, H5G_loc_t *loc, const char *name, H5R_type_t ref_type, H5 HDmemset(ref, 0, H5R_DSET_REG_REF_BUF_SIZE); /* Get the amount of space required to serialize the selection */ - if ((buf_size = H5S_SELECT_SERIAL_SIZE(space)) < 0) + if ((buf_size = H5S_SELECT_SERIAL_SIZE(space, loc->oloc->file)) < 0) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "Invalid amount of space for serializing selection") /* Increase buffer size to allow for the dataset OID */ @@ -305,7 +305,7 @@ H5R_create(void *_ref, H5G_loc_t *loc, const char *name, H5R_type_t ref_type, H5 H5F_addr_encode(loc->oloc->file, &p, obj_loc.oloc->addr); /* Serialize the selection into heap buffer */ - if (H5S_SELECT_SERIALIZE(space, &p) < 0) + if (H5S_SELECT_SERIALIZE(space, &p, loc->oloc->file) < 0) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCOPY, FAIL, "Unable to serialize selection") /* Save the serialized buffer for later */ |