diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-06-18 13:41:43 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-18 13:41:43 (GMT) |
commit | 0ea7d164342e76ffe1e06e957d28a7133e48a08c (patch) | |
tree | 26157139ba3222e0d9331fabfcf971b730948c6e /src | |
parent | 2ade6f1f0568d1b9179766e77bad563c07a1d127 (diff) | |
download | hdf5-0ea7d164342e76ffe1e06e957d28a7133e48a08c.zip hdf5-0ea7d164342e76ffe1e06e957d28a7133e48a08c.tar.gz hdf5-0ea7d164342e76ffe1e06e957d28a7133e48a08c.tar.bz2 |
Minor H5I fixes and tweaks (#770)
Diffstat (limited to 'src')
-rw-r--r-- | src/H5Idbg.c | 2 | ||||
-rw-r--r-- | src/H5Iint.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Idbg.c b/src/H5Idbg.c index 71937e8..cf114d4 100644 --- a/src/H5Idbg.c +++ b/src/H5Idbg.c @@ -111,7 +111,7 @@ H5I__id_dump_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) const H5T_t *dt = (const H5T_t *)info->object; H5_GCC_DIAG_OFF("cast-qual") - object = (void *)H5T_get_actual_type((H5T_t *)dt); /* Casting away const OK - QAK */ + object = (void *)H5T_get_actual_type((H5T_t *)dt); H5_GCC_DIAG_ON("cast-qual") path = H5T_nameof((const H5T_t *)object); diff --git a/src/H5Iint.c b/src/H5Iint.c index e512d4b..3bce3de 100644 --- a/src/H5Iint.c +++ b/src/H5Iint.c @@ -636,7 +636,7 @@ H5I_subst(hid_t id, const void *new_object) /* Get the old object pointer to return */ H5_GCC_DIAG_OFF("cast-qual") - ret_value = (void *)info->object; /* (Casting away const OK -QAK) */ + ret_value = (void *)info->object; H5_GCC_DIAG_ON("cast-qual") /* Set the new object pointer for the ID */ @@ -670,7 +670,7 @@ H5I_object(hid_t id) if (NULL != (info = H5I__find_id(id))) { /* Get the object pointer to return */ H5_GCC_DIAG_OFF("cast-qual") - ret_value = (void *)info->object; /* (Casting away const OK -QAK) */ + ret_value = (void *)info->object; H5_GCC_DIAG_ON("cast-qual") } @@ -706,7 +706,7 @@ H5I_object_verify(hid_t id, H5I_type_t type) if (type == H5I_TYPE(id) && NULL != (info = H5I__find_id(id))) { /* Get the object pointer to return */ H5_GCC_DIAG_OFF("cast-qual") - ret_value = (void *)info->object; /* (Casting away const OK -QAK) */ + ret_value = (void *)info->object; H5_GCC_DIAG_ON("cast-qual") } @@ -815,7 +815,7 @@ H5I__remove_verify(hid_t id, H5I_type_t type) { void *ret_value = NULL; /*return value */ - FUNC_ENTER_STATIC_NOERR + FUNC_ENTER_PACKAGE_NOERR /* Argument checking will be performed by H5I_remove() */ @@ -869,7 +869,7 @@ H5I__remove_common(H5I_type_info_t *type_info, hid_t id) type_info->last_id_info = NULL; H5_GCC_DIAG_OFF("cast-qual") - ret_value = (void *)info->object; /* (Casting away const OK -QAK) */ + ret_value = (void *)info->object; H5_GCC_DIAG_ON("cast-qual") if (!H5I_marking_g) @@ -1163,7 +1163,7 @@ H5I__inc_type_ref(H5I_type_t type) H5I_type_info_t *type_info = NULL; /* Pointer to the type */ int ret_value = -1; /* Return value */ - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE /* Sanity check */ HDassert(type > 0 && (int)type < H5I_next_type_g); @@ -1249,7 +1249,7 @@ H5I__get_type_ref(H5I_type_t type) H5I_type_info_t *type_info = NULL; /* Pointer to the type */ int ret_value = -1; /* Return value */ - FUNC_ENTER_STATIC + FUNC_ENTER_PACKAGE /* Sanity check */ HDassert(type >= 0); |