diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2015-04-10 23:00:48 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2015-04-10 23:00:48 (GMT) |
| commit | 6a27582a4488d4d18a0b6cd584b8950ab02b81a7 (patch) | |
| tree | 01615f7679a3d3ef4b2d9caa487874aa421df506 /src/H5HG.c | |
| parent | 7a4b02567e4de16d7478c10ffa07562b0daf320b (diff) | |
| parent | 3875cc6960266775e8078c782c8864516865be67 (diff) | |
| download | hdf5-6a27582a4488d4d18a0b6cd584b8950ab02b81a7.zip hdf5-6a27582a4488d4d18a0b6cd584b8950ab02b81a7.tar.gz hdf5-6a27582a4488d4d18a0b6cd584b8950ab02b81a7.tar.bz2 | |
[svn-r26781] Merge revisions 26305 through 26780 from trunk to vds branch.
Tested: ummon
Diffstat (limited to 'src/H5HG.c')
| -rw-r--r-- | src/H5HG.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); @@ -820,7 +820,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*/ |