diff options
Diffstat (limited to 'test/h5test.c')
| -rw-r--r-- | test/h5test.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/test/h5test.c b/test/h5test.c index 1338b5b..042c763 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -89,11 +89,7 @@ MPI_Info h5_io_info_g=MPI_INFO_NULL;/* MPI INFO object for IO */ */ static const char *multi_letters = "msbrglo"; -#ifdef H5_WANT_H5_V1_6_COMPAT -static herr_t h5_errors(void *client_data); -#else /* H5_WANT_H5_V1_6_COMPAT */ static herr_t h5_errors(hid_t err_stack, void *client_data); -#endif /* H5_WANT_H5_V1_6_COMPAT */ /*------------------------------------------------------------------------- @@ -112,20 +108,11 @@ static herr_t h5_errors(hid_t err_stack, void *client_data); * *------------------------------------------------------------------------- */ -#ifdef H5_WANT_H5_V1_6_COMPAT -static herr_t -h5_errors(void UNUSED *client_data) -#else static herr_t h5_errors(hid_t err_stack, void UNUSED *client_data) -#endif /* H5_WANT_H5_V1_6_COMPAT */ { H5_FAILED(); -#ifdef H5_WANT_H5_V1_6_COMPAT - H5Eprint (stdout); -#else - H5Eprint (err_stack, stdout); -#endif /* H5_WANT_H5_V1_6_COMPAT */ + H5Eprint_stack(err_stack, stdout); return 0; } @@ -228,11 +215,8 @@ h5_reset(void) HDfflush(stdout); HDfflush(stderr); H5close(); -#ifdef H5_WANT_H5_V1_6_COMPAT - H5Eset_auto (h5_errors, NULL); -#else - H5Eset_auto (H5E_DEFAULT, h5_errors, NULL); -#endif /* H5_WANT_H5_V1_6_COMPAT */ + + H5Eset_auto_stack(H5E_DEFAULT, h5_errors, NULL); /* * Cause the library to emit some diagnostics early so they don't |