diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2018-12-31 13:05:32 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2018-12-31 13:05:32 (GMT) |
commit | 17d5f51bed455c47cdeecd0afcc71b73b873ae55 (patch) | |
tree | a626b25a555518963c37e50c0ef26dcf30b5d5c2 /src/H5T.c | |
parent | 43bd13837d0c2e50651cbded2fae90d9189d1b73 (diff) | |
parent | 029491e877a3c5c4f5947df3cc74785ce01be2ba (diff) | |
download | hdf5-17d5f51bed455c47cdeecd0afcc71b73b873ae55.zip hdf5-17d5f51bed455c47cdeecd0afcc71b73b873ae55.tar.gz hdf5-17d5f51bed455c47cdeecd0afcc71b73b873ae55.tar.bz2 |
Merge pull request #1415 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10
* commit '029491e877a3c5c4f5947df3cc74785ce01be2ba':
Merge of logging framework updates.
Updated the H5I debug function so it's more robust and always available.
Removed 'VOL' from some H5PL comments.
Removed 'VOL' versions of FUNC_ENTER macros as well as empty functions orginally intended to support the full SWMR feature (from develop).
Replaced all MPI-1 calls with MPI-2 equivalents (from develop).
Diffstat (limited to 'src/H5T.c')
-rw-r--r-- | src/H5T.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3714,7 +3714,7 @@ H5T__close_cb(H5T_t *dt) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_STATIC_VOL + FUNC_ENTER_STATIC /* check args */ HDassert(dt && dt->shared); @@ -3724,7 +3724,7 @@ H5T__close_cb(H5T_t *dt) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCLOSEOBJ, FAIL, "can't close datatype"); done: - FUNC_LEAVE_NOAPI_VOL(ret_value) + FUNC_LEAVE_NOAPI(ret_value) } /* end H5T__close_cb() */ |