summaryrefslogtreecommitdiffstats
path: root/src/H5Oshared.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@koziol.gov>2019-04-03 22:27:10 (GMT)
committerQuincey Koziol <koziol@koziol.gov>2019-04-03 22:27:10 (GMT)
commitfc945999d00fc66f3b6251115f8bc13d4b18814c (patch)
tree1751166c747d63296baac940ccef17ee0f3d8033 /src/H5Oshared.c
parente6b8ebe95472fff931878beffe936edcacf5f122 (diff)
parent3d99a6a7937fdd67a0574b7025189ac6459a67d8 (diff)
downloadhdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.zip
hdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.tar.gz
hdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.tar.bz2
Merge remote-tracking branch 'origin/develop' into env_vol_load
Diffstat (limited to 'src/H5Oshared.c')
-rw-r--r--src/H5Oshared.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 4fc0488..67ca76f 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -39,6 +39,7 @@
#include "H5Fprivate.h" /* File access */
#include "H5Gprivate.h" /* Groups */
#include "H5HFprivate.h" /* Fractal heap */
+#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
#include "H5SMprivate.h" /* Shared object header messages */
#include "H5WBprivate.h" /* Wrapped Buffers */
@@ -358,7 +359,7 @@ H5O__shared_decode(H5F_t *f, H5O_t *open_oh, unsigned *ioflags, const uint8_t *b
*/
if(sh_mesg.type == H5O_SHARE_TYPE_SOHM) {
HDassert(version >= H5O_SHARED_VERSION_3);
- HDmemcpy(&sh_mesg.u.heap_id, buf, sizeof(sh_mesg.u.heap_id));
+ H5MM_memcpy(&sh_mesg.u.heap_id, buf, sizeof(sh_mesg.u.heap_id));
} /* end if */
else {
/* The H5O_COMMITTED_FLAG should be set if this message
@@ -426,7 +427,7 @@ H5O__shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_m
* object header that holds it.
*/
if(sh_mesg->type == H5O_SHARE_TYPE_SOHM)
- HDmemcpy(buf, &(sh_mesg->u.heap_id), sizeof(sh_mesg->u.heap_id));
+ H5MM_memcpy(buf, &(sh_mesg->u.heap_id), sizeof(sh_mesg->u.heap_id));
else
H5F_addr_encode(f, &buf, sh_mesg->u.loc.oh_addr);