diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-06-05 15:04:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 15:04:56 (GMT) |
| commit | 7ecf1d09afa9379186c2ace158fb60d4afd96f0e (patch) | |
| tree | 529564764b9cc063dcf0f8741ce45d5c2fd11095 /src/H5Ocopy.c | |
| parent | e3559c7b64e7963e3515c2ebfd7f1abad810ed19 (diff) | |
| download | hdf5-7ecf1d09afa9379186c2ace158fb60d4afd96f0e.zip hdf5-7ecf1d09afa9379186c2ace158fb60d4afd96f0e.tar.gz hdf5-7ecf1d09afa9379186c2ace158fb60d4afd96f0e.tar.bz2 | |
Convert H5F haddr_t macros to H5 (#3039)
Several macros for handling haddr_t values exist in H5Fprivate.h
and have H5F prefixes, even though they have nothing to do with
a particular file (e.g., H5F_addr_lt()).
These macros have been moved to H5private.h and renamed to have
an H5 prefix.
Affected macros:
H5F_addr_overflow
H5F_addr_defined
H5F_addr_eq
H5F_addr_ne
H5F_addr_lt
H5F_addr_le
H5F_addr_gt
H5F_addr_ge
H5F_addr_cmp
H5F_addr_overlap
H5F_addr_pow2 was unused and removed instead of converted.
Diffstat (limited to 'src/H5Ocopy.c')
| -rw-r--r-- | src/H5Ocopy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 9852d1f..8d39800 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -225,7 +225,7 @@ H5O__copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, H5 HDassert(oloc_src); HDassert(oloc_src->file); - HDassert(H5F_addr_defined(oloc_src->addr)); + HDassert(H5_addr_defined(oloc_src->addr)); HDassert(oloc_dst->file); HDassert(cpy_info); @@ -650,7 +650,7 @@ H5O__copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, H5 (size_t)dst_oh_size + oh_dst->chunk[0].image); /* Set the dest. object location to the first chunk address */ - HDassert(H5F_addr_defined(addr_new)); + HDassert(H5_addr_defined(addr_new)); oloc_dst->addr = addr_new; /* If we are merging committed datatypes and this is a committed datatype, insert @@ -952,7 +952,7 @@ H5O__copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, hid_t /* Sanity check */ HDassert(oloc_src); HDassert(oloc_src->file); - HDassert(H5F_addr_defined(oloc_src->addr)); + HDassert(H5_addr_defined(oloc_src->addr)); HDassert(oloc_dst->file); /* Initialize copy info before errors can be thrown */ @@ -1186,7 +1186,7 @@ H5O__copy_search_comm_dt_attr_cb(const H5A_t *attr, void *_udata) HDassert(attr); HDassert(udata); HDassert(udata->dst_dt_list); - HDassert(H5F_addr_defined(udata->obj_oloc.addr)); + HDassert(H5_addr_defined(udata->obj_oloc.addr)); /* Get attribute datatype */ if (NULL == (dt = H5A_type(attr))) |