diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-01-16 22:11:46 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-01-16 22:11:46 (GMT) |
| commit | 55670c88cfa07a4fd5a884502f8bd32768f70256 (patch) | |
| tree | 74da25151de6d1e32329dfcd62e17c863e2e3de1 /src/H5Epublic.h | |
| parent | 024f7ba09250110c19b070c9699cfbc0f9dc2b96 (diff) | |
| parent | a92c735c9b57049e8c4037d3490f7e10f8eef4d6 (diff) | |
| download | hdf5-55670c88cfa07a4fd5a884502f8bd32768f70256.zip hdf5-55670c88cfa07a4fd5a884502f8bd32768f70256.tar.gz hdf5-55670c88cfa07a4fd5a884502f8bd32768f70256.tar.bz2 | |
Merge pull request #2272 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:tr_squash to develop
* commit 'a92c735c9b57049e8c4037d3490f7e10f8eef4d6':
Squashed commit of the token_refactoring branch:
Diffstat (limited to 'src/H5Epublic.h')
| -rw-r--r-- | src/H5Epublic.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Epublic.h b/src/H5Epublic.h index 3eae2da..ed14217 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -100,14 +100,14 @@ H5_DLLVAR hid_t H5E_ERR_CLS_g; } #else /* H5_NO_DEPRECATED_SYMBOLS */ #define H5E_BEGIN_TRY { \ - H5E_auto_t saved_efunc; \ + H5E_auto2_t saved_efunc; \ void *H5E_saved_edata; \ \ - (void)H5Eget_auto(H5E_DEFAULT, &saved_efunc, &H5E_saved_edata); \ - (void)H5Eset_auto(H5E_DEFAULT, NULL, NULL); + (void)H5Eget_auto2(H5E_DEFAULT, &saved_efunc, &H5E_saved_edata); \ + (void)H5Eset_auto2(H5E_DEFAULT, NULL, NULL); #define H5E_END_TRY \ - (void)H5Eset_auto(H5E_DEFAULT, saved_efunc, H5E_saved_edata); \ + (void)H5Eset_auto2(H5E_DEFAULT, saved_efunc, H5E_saved_edata); \ } #endif /* H5_NO_DEPRECATED_SYMBOLS */ |