diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-10-07 16:00:43 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-10-07 16:00:43 (GMT) |
| commit | 011db9e56cb2c2ba4d872eb8208ce604363e9fad (patch) | |
| tree | 75f682b4292e5aa1bd7e9e12c8be88ee78b648cd /src/H5Eint.c | |
| parent | 4b5ae88422348a6c99750dd2a8d0178f78743b25 (diff) | |
| download | hdf5-011db9e56cb2c2ba4d872eb8208ce604363e9fad.zip hdf5-011db9e56cb2c2ba4d872eb8208ce604363e9fad.tar.gz hdf5-011db9e56cb2c2ba4d872eb8208ce604363e9fad.tar.bz2 | |
[svn-r19533] Bug 1707 - an update according to Neil's suggestion. I took out the VERS, IS_DEFAULT from
H5E_auto_t structure in H5Epkg.h when the macro H5_NO_DEPRECATED_SYMBOLS is defined.
Tested on jam, heiwa, amani.
Diffstat (limited to 'src/H5Eint.c')
| -rw-r--r-- | src/H5Eint.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/H5Eint.c b/src/H5Eint.c index 75aadda..eff9049 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -1011,18 +1011,20 @@ H5E_dump_api_stack(hbool_t is_api) H5E_t *estack = H5E_get_my_stack(); HDassert(estack); + +#ifdef H5_NO_DEPRECATED_SYMBOLS + if(estack->auto_op.func2) + (void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data)); +#else if(estack->auto_op.vers == 1) { -#ifndef H5_NO_DEPRECATED_SYMBOLS if(estack->auto_op.func1) (void)((estack->auto_op.func1)(estack->auto_data)); -#else /* H5_NO_DEPRECATED_SYMBOLS */ - HDassert(0 && "version 1 error stack dump without deprecated symbols!"); -#endif /* H5_NO_DEPRECATED_SYMBOLS */ } /* end if */ else { if(estack->auto_op.func2) (void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data)); } /* end else */ +#endif } /* end if */ done: |