diff options
author | Quincey Koziol <koziol@koziol.gov> | 2019-04-03 22:27:10 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@koziol.gov> | 2019-04-03 22:27:10 (GMT) |
commit | fc945999d00fc66f3b6251115f8bc13d4b18814c (patch) | |
tree | 1751166c747d63296baac940ccef17ee0f3d8033 /src/H5FL.c | |
parent | e6b8ebe95472fff931878beffe936edcacf5f122 (diff) | |
parent | 3d99a6a7937fdd67a0574b7025189ac6459a67d8 (diff) | |
download | hdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.zip hdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.tar.gz hdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.tar.bz2 |
Merge remote-tracking branch 'origin/develop' into env_vol_load
Diffstat (limited to 'src/H5FL.c')
-rw-r--r-- | src/H5FL.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1142,7 +1142,7 @@ H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_ if((ret_value=H5FL_blk_malloc(head,new_size H5FL_TRACK_INFO_INT))==NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for block") blk_size=MIN(new_size,temp->size); - HDmemcpy(ret_value,block,blk_size); + H5MM_memcpy(ret_value,block,blk_size); H5FL_blk_free(head,block); } /* end if */ else { @@ -1630,7 +1630,7 @@ H5FL_arr_realloc(H5FL_arr_head_t *head, void * obj, size_t new_elem) /* Copy the appropriate amount of elements */ blk_size = head->list_arr[MIN(temp->nelem, new_elem)].size; - HDmemcpy(ret_value, obj, blk_size); + H5MM_memcpy(ret_value, obj, blk_size); /* Free the old block */ H5FL_arr_free(head, obj); |