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/H5Ocopy.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/H5Ocopy.c')
-rw-r--r-- | src/H5Ocopy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index a3d4884..9578f95 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -732,7 +732,7 @@ H5O__copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, * header. This will be written when the header is flushed to disk. */ if(oh_dst->version > H5O_VERSION_1) - HDmemcpy(current_pos, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC); + H5MM_memcpy(current_pos, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC); current_pos += H5O_SIZEOF_HDR(oh_dst) - H5O_SIZEOF_CHKSUM_OH(oh_dst); /* Loop through destination messages, updating their "raw" info */ @@ -755,7 +755,7 @@ H5O__copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, /* Copy each message that wasn't dirtied above */ if(!mesg_dst->dirty) /* Copy the message header plus the message's raw data. */ - HDmemcpy(current_pos, mesg_src->raw - msghdr_size, msghdr_size + mesg_src->raw_size); + H5MM_memcpy(current_pos, mesg_src->raw - msghdr_size, msghdr_size + mesg_src->raw_size); /* Set message's raw pointer to destination chunk's new "image" */ mesg_dst->raw = current_pos + msghdr_size; |