summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-08-12 12:46:40 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-08-12 12:46:40 (GMT)
commit507a21125783ea03d75e8c6460212cd22f8466ee (patch)
treea8279d3036e2bf3b625d33a104ac35996e26dfcf /src
parent4f61812180385bb969fee33eece609180cab4866 (diff)
downloadhdf5-507a21125783ea03d75e8c6460212cd22f8466ee.zip
hdf5-507a21125783ea03d75e8c6460212cd22f8466ee.tar.gz
hdf5-507a21125783ea03d75e8c6460212cd22f8466ee.tar.bz2
[svn-r15462] Description:
Correct compiler warnings from Visual Studio. Tested on: Mac OS X/32 10.5.4 (amazon) w/FORTRAN & C++ (Too minor to require full h5committest)
Diffstat (limited to 'src')
-rw-r--r--src/H5Dchunk.c3
-rw-r--r--src/H5Dscatgath.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 711b91b..d15715b 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -3266,7 +3266,8 @@ H5D_chunk_prune_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
/* The number of bytes accessed in the chunk */
/* (i.e. the bytes replaced with fill values) */
- bytes_accessed = sel_nelmts * layout->u.chunk.dim[rank];
+ H5_CHECK_OVERFLOW(sel_nelmts, hssize_t, uint32_t);
+ bytes_accessed = (uint32_t)sel_nelmts * layout->u.chunk.dim[rank];
/* Release lock on chunk */
if(H5D_chunk_unlock(io_info, TRUE, idx_hint, chunk, bytes_accessed) < 0)
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c
index 3ea4c69..9f98622 100644
--- a/src/H5Dscatgath.c
+++ b/src/H5Dscatgath.c
@@ -802,7 +802,8 @@ H5D_compound_opt_read(size_t nelmts, const H5S_t *space,
/* Get the number of bytes and offset in sequence */
curr_len = len[curr_seq];
- curr_off = off[curr_seq];
+ H5_CHECK_OVERFLOW(off[curr_seq], hsize_t, size_t);
+ curr_off = (size_t)off[curr_seq];
/* Decide the number of elements and position in the buffer. */
curr_nelmts = curr_len / dst_stride;