diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2012-07-26 18:12:00 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2012-07-26 18:12:00 (GMT) |
| commit | 0ea9a38644765aa4045b9110e86c5e50a5f24dac (patch) | |
| tree | 023fa96d49ee39fe3b80d99a6a3e8c4cf2866fc4 /src | |
| parent | 85d0f3befd5e2345ae5b7c07af5d944bcd91f656 (diff) | |
| download | hdf5-0ea9a38644765aa4045b9110e86c5e50a5f24dac.zip hdf5-0ea9a38644765aa4045b9110e86c5e50a5f24dac.tar.gz hdf5-0ea9a38644765aa4045b9110e86c5e50a5f24dac.tar.bz2 | |
[svn-r22607] Port test from r22601 from trunk to 1.8 branch. Also remove spurious
FUNC_ENTER_PACKAGE_TAG and FUNC_ENTER_STATIC_TAG macros.
Tested: jam, koala, ostrich (h5committest), durandal
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5private.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/H5private.h b/src/H5private.h index ef6c9d8..32c3aad 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1899,18 +1899,6 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); H5_PUSH_FUNC \ { -/* Use the following macro as replacement for the FUNC_ENTER_PACKAGE - * macro when the function needs to set up a metadata tag. */ -#define FUNC_ENTER_PACKAGE_TAG(dxpl_id, tag, err) { \ - haddr_t prev_tag = HADDR_UNDEF; \ - hid_t tag_dxpl_id = dxpl_id; \ - \ - FUNC_ENTER_COMMON(H5_IS_PKG(FUNC)); \ - if(H5AC_tag(tag_dxpl_id, tag, &prev_tag) < 0) \ - HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, err, "unable to apply metadata tag") \ - H5_PUSH_FUNC \ - { - /* Use this macro for all "normal" staticly-scoped functions */ #define FUNC_ENTER_STATIC { \ FUNC_ENTER_COMMON(H5_IS_PKG(FUNC)); \ @@ -1923,18 +1911,6 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); H5_PUSH_FUNC \ { -/* Use the following macro as replacement for the FUNC_ENTER_STATIC - * macro when the function needs to set up a metadata tag. */ -#define FUNC_ENTER_STATIC_TAG(dxpl_id, tag, err) { \ - haddr_t prev_tag = HADDR_UNDEF; \ - hid_t tag_dxpl_id = dxpl_id; \ - \ - FUNC_ENTER_COMMON(H5_IS_PKG(FUNC)); \ - if(H5AC_tag(tag_dxpl_id, tag, &prev_tag) < 0) \ - HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, err, "unable to apply metadata tag") \ - H5_PUSH_FUNC \ - { - /* Use this macro for all non-API functions, which propagate errors, but don't issue them */ #define FUNC_ENTER_NOAPI_NOERR { \ FUNC_ENTER_COMMON_NOERR(!H5_IS_API(FUNC)); \ |