summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-12-11 21:13:16 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-12-11 21:13:16 (GMT)
commit907a630019c9059eafb0e5af3aeb0f63f47d3d44 (patch)
tree88760b1c50db082d6470b0f73b4f66c366d55765
parenta1a1cfcd22df965cf8aef2c2bce65e712494e5ac (diff)
parent9b38aef978299a76b6b19586396bf626a1e58df6 (diff)
downloadhdf5-907a630019c9059eafb0e5af3aeb0f63f47d3d44.zip
hdf5-907a630019c9059eafb0e5af3aeb0f63f47d3d44.tar.gz
hdf5-907a630019c9059eafb0e5af3aeb0f63f47d3d44.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_12)
* commit '9b38aef978299a76b6b19586396bf626a1e58df6': Fix 2010 compile issue
-rw-r--r--src/H5Dchunk.c2
-rw-r--r--src/H5Rint.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 381ca4a..2536661 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -2169,9 +2169,9 @@ H5D__create_chunk_mem_map_1d(const H5D_chunk_map_t *fm)
chunk_info->mspace_shared = TRUE;
} /* end if */
else {
- HDassert(fm->m_ndims == 1);
hsize_t mem_sel_start[H5S_MAX_RANK]; /* Offset of low bound of file selection */
hsize_t mem_sel_end[H5S_MAX_RANK]; /* Offset of high bound of file selection */
+ HDassert(fm->m_ndims == 1);
if(H5S_SELECT_BOUNDS(fm->mem_space, mem_sel_start, mem_sel_end) < 0)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
diff --git a/src/H5Rint.c b/src/H5Rint.c
index 9879865..90f8249 100644
--- a/src/H5Rint.c
+++ b/src/H5Rint.c
@@ -1170,8 +1170,8 @@ H5R__encode_region(H5S_t *space, unsigned char *buf, size_t *nalloc)
/* Don't encode if buffer size isn't big enough or buffer is empty */
if(buf && *nalloc >= ((size_t)buf_size + 2 * H5_SIZEOF_UINT32_T)) {
- p = (uint8_t *)buf;
int rank;
+ p = (uint8_t *)buf;
/* Encode the size for safety check */
UINT32ENCODE(p, (uint32_t)buf_size);