diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-04-24 17:57:30 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-04-24 17:57:30 (GMT) |
| commit | 7dd53873f73ee67046607b50067b543f2a44cab3 (patch) | |
| tree | 4d08558545b8403ed43ff27ebb5bd02b8503a52e /src/H5Oint.c | |
| parent | 6682f51a1157dc9e88bd34528fff999aee50ca2a (diff) | |
| parent | 4fbe80acc27bc0e84eec9880c3c4257802e5bae5 (diff) | |
| download | hdf5-7dd53873f73ee67046607b50067b543f2a44cab3.zip hdf5-7dd53873f73ee67046607b50067b543f2a44cab3.tar.gz hdf5-7dd53873f73ee67046607b50067b543f2a44cab3.tar.bz2 | |
Merge branch 'develop' into H10621
Diffstat (limited to 'src/H5Oint.c')
| -rw-r--r-- | src/H5Oint.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/H5Oint.c b/src/H5Oint.c index d3a409c..60aae45 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 */ @@ -132,6 +130,7 @@ const H5O_msg_class_t *const H5O_msg_class_g[] = { const unsigned H5O_obj_ver_bounds[] = { H5O_VERSION_1, /* H5F_LIBVER_EARLIEST */ H5O_VERSION_2, /* H5F_LIBVER_V18 */ + H5O_VERSION_2, /* H5F_LIBVER_V110 */ H5O_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; @@ -496,7 +495,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 +1920,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) { |