diff options
author | Quincey Koziol <koziol@koziol.gov> | 2019-03-17 04:01:18 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@koziol.gov> | 2019-03-17 04:01:18 (GMT) |
commit | cda6273737eda85398a110e9df73b67dc30722ab (patch) | |
tree | a550007d120df30fecba97eda7460fcd837f8dc3 /src/H5Oint.c | |
parent | 9d86314f8b71f090b71d7edec8014935f5cd3cc7 (diff) | |
parent | f0d22e54c705285b10f8192be6b26ba1a7ae3fbc (diff) | |
download | hdf5-cda6273737eda85398a110e9df73b67dc30722ab.zip hdf5-cda6273737eda85398a110e9df73b67dc30722ab.tar.gz hdf5-cda6273737eda85398a110e9df73b67dc30722ab.tar.bz2 |
Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01
Diffstat (limited to 'src/H5Oint.c')
-rw-r--r-- | src/H5Oint.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/H5Oint.c b/src/H5Oint.c index d3a409c..570f94e 100644 --- a/src/H5Oint.c +++ b/src/H5Oint.c @@ -38,9 +38,7 @@ #include "H5Iprivate.h" /* IDs */ #include "H5Lprivate.h" /* Links */ #include "H5MFprivate.h" /* File memory management */ -#ifdef H5O_ENABLE_BOGUS #include "H5MMprivate.h" /* Memory management */ -#endif /* H5O_ENABLE_BOGUS */ #include "H5Opkg.h" /* Object headers */ #include "H5VLprivate.h" /* Virtual Object Layer */ @@ -496,7 +494,7 @@ H5O__apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t ini /* Put magic # for object header in first chunk */ if(H5O_VERSION_1 < oh->version) - HDmemcpy(oh->chunk[0].image, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC); + H5MM_memcpy(oh->chunk[0].image, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC); /* Create the message list */ oh->nmesgs = 1; @@ -1921,7 +1919,7 @@ H5O_loc_copy(H5O_loc_t *dst, H5O_loc_t *src, H5_copy_depth_t depth) HDassert(depth == H5_COPY_SHALLOW || depth == H5_COPY_DEEP); /* Copy the top level information */ - HDmemcpy(dst, src, sizeof(H5O_loc_t)); + H5MM_memcpy(dst, src, sizeof(H5O_loc_t)); /* Deep copy the names */ if(depth == H5_COPY_DEEP) { |