diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2019-06-29 00:30:41 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2019-06-29 00:30:41 (GMT) |
| commit | f97ea92fe5450cefd4c4d9fb266e7f42a952f2f9 (patch) | |
| tree | a90c9464b052898428c596e7c085683024141890 /src/H5Dchunk.c | |
| parent | 13d951d37205bcd48723330a898e5d67c5e1ecb2 (diff) | |
| parent | 6ced6457c3048bd10bf6f470b329b4810d9be826 (diff) | |
| download | hdf5-f97ea92fe5450cefd4c4d9fb266e7f42a952f2f9.zip hdf5-f97ea92fe5450cefd4c4d9fb266e7f42a952f2f9.tar.gz hdf5-f97ea92fe5450cefd4c4d9fb266e7f42a952f2f9.tar.bz2 | |
Merge pull request #1784 in HDFFV/hdf5 from ~KOZIOL/hdf5:feature/update_gcc_flags to develop
* commit '6ced6457c3048bd10bf6f470b329b4810d9be826':
Move the -Wformat-nonliteral warning to the developer flags. Fix bugs I introduced in the last commit.
Updated configure & CMake compiler flags for GCC 8.x, along with corresponding changes to warnhist script (and some extra improvements for condensing C++ and Java warnings), and fixed a bunch of warnings.
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index a8dc398..6fdea92 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2018,7 +2018,7 @@ H5D__create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm) if(H5S_SEL_ALL == chunk_sel_type) { /* Adjust the chunk coordinates */ for(u = 0; u < fm->f_ndims; u++) - coords[u] -= adjust[u]; + coords[u] = (hsize_t)((hssize_t)coords[u] - adjust[u]); /* Set to same shape as chunk */ if(H5S_select_hyperslab(chunk_info->mspace, H5S_SELECT_SET, coords, NULL, fm->chunk_dim, NULL) < 0) @@ -6703,7 +6703,7 @@ done: */ herr_t H5D__chunk_file_alloc(const H5D_chk_idx_info_t *idx_info, const H5F_block_t *old_chunk, - H5F_block_t *new_chunk, hbool_t *need_insert, hsize_t scaled[]) + H5F_block_t *new_chunk, hbool_t *need_insert, const hsize_t *scaled) { hbool_t alloc_chunk = FALSE; /* Whether to allocate chunk */ herr_t ret_value = SUCCEED; /* Return value */ |