summaryrefslogtreecommitdiffstats
path: root/test/ttsafe_error.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2010-09-20 21:57:57 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2010-09-20 21:57:57 (GMT)
commitd688fc55a94acc6bdf43607e5224bc28009ee5e8 (patch)
treee46dc5152aafe70254b02c330bcf5fa2ecf6d892 /test/ttsafe_error.c
parentd3d78bbd1be7dddd41b2a9f7e25ea42ce2192ddd (diff)
downloadhdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.zip
hdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.tar.gz
hdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.tar.bz2
[svn-r19441] Bug fix for 1707 - in a hurry, explain later.
tested on jam and amani, heiwa hasn't finished yet.
Diffstat (limited to 'test/ttsafe_error.c')
-rw-r--r--test/ttsafe_error.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c
index f55afdc..edc5c07 100644
--- a/test/ttsafe_error.c
+++ b/test/ttsafe_error.c
@@ -158,16 +158,24 @@ void *tts_error_thread(void UNUSED *arg)
{
hid_t dataspace, datatype, dataset;
hsize_t dimsf[1]; /* dataset dimensions */
- H5E_auto2_t old_error_cb;
+ H5E_auto_t old_error_cb;
void *old_error_client_data;
int value;
int ret;
+#ifdef H5_USE_16_API_DEFAULT
/* preserve previous error stack handler */
- H5Eget_auto2(H5E_DEFAULT, &old_error_cb, &old_error_client_data);
+ H5Eget_auto(&old_error_cb, &old_error_client_data);
/* set each thread's error stack handler */
- H5Eset_auto2(H5E_DEFAULT, error_callback, NULL);
+ H5Eset_auto(error_callback, NULL);
+#else /* H5_USE_16_API_DEFAULT */
+ /* preserve previous error stack handler */
+ H5Eget_auto(H5E_DEFAULT, &old_error_cb, &old_error_client_data);
+
+ /* set each thread's error stack handler */
+ H5Eset_auto(H5E_DEFAULT, error_callback, NULL);
+#endif /* H5_USE_16_API_DEFAULT */
/* define dataspace for dataset */
dimsf[0] = 1;
@@ -193,7 +201,11 @@ void *tts_error_thread(void UNUSED *arg)
assert(ret >= 0);
/* turn our error stack handler off */
- H5Eset_auto2(H5E_DEFAULT, old_error_cb, old_error_client_data);
+#ifdef H5_USE_16_API_DEFAULT
+ H5Eset_auto(old_error_cb, old_error_client_data);
+#else /* H5_USE_16_API_DEFAULT */
+ H5Eset_auto(H5E_DEFAULT, old_error_cb, old_error_client_data);
+#endif /* H5_USE_16_API_DEFAULT */
return NULL;
}