summaryrefslogtreecommitdiffstats
path: root/src/H5HG.c
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2015-04-03 17:40:11 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2015-04-03 17:40:11 (GMT)
commit523a4f7658cc3af131a4a10f8030fc7387745702 (patch)
tree4758f745b1942d4ef8fc653c79ac0255196ca7ca /src/H5HG.c
parentdb447ec89ab9968af637941a146129f437ba8b98 (diff)
downloadhdf5-523a4f7658cc3af131a4a10f8030fc7387745702.zip
hdf5-523a4f7658cc3af131a4a10f8030fc7387745702.tar.gz
hdf5-523a4f7658cc3af131a4a10f8030fc7387745702.tar.bz2
[svn-r26717] Merge revisions 26387, 26649, 26650, 26678, and 26691 from trunk to squish warnings.
Diffstat (limited to 'src/H5HG.c')
-rw-r--r--src/H5HG.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HG.c b/src/H5HG.c
index a5d779e..a861042 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -182,7 +182,7 @@ HDmemset(heap->chunk, 0, size);
* which was always at least H5HG_ALIGNMENT aligned then we could just
* align the pointer, but this might not be the case.
*/
- n = H5HG_ALIGN(p - heap->chunk) - (p - heap->chunk);
+ n = H5HG_ALIGN(p - heap->chunk) - (size_t)(p - heap->chunk);
#ifdef OLD_WAY
/* Don't bother zeroing out the rest of the info in the heap -QAK */
HDmemset(p, 0, n);
@@ -776,7 +776,7 @@ H5HG_remove (H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
else
heap->obj[0].size += need;
HDmemmove(obj_start, obj_start + need,
- heap->size - ((obj_start + need) - heap->chunk));
+ heap->size - (size_t)((obj_start + need) - heap->chunk));
if(heap->obj[0].size >= H5HG_SIZEOF_OBJHDR(f)) {
p = heap->obj[0].begin;
UINT16ENCODE(p, 0); /*id*/