summaryrefslogtreecommitdiffstats
path: root/test/dtransform.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/dtransform.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/dtransform.c')
-rw-r--r--test/dtransform.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/test/dtransform.c b/test/dtransform.c
index 5d5cefe..15c5934 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -641,7 +641,7 @@ static int
test_set(void)
{
hid_t dxpl_id = -1;
- H5E_auto2_t func;
+ H5E_auto_t func;
const char *str = "(9/5.0)*x + 32";
char *ptrgetTest = NULL;
@@ -654,9 +654,15 @@ test_set(void)
TEST_ERROR
/* Test get before set */
- H5Eget_auto2(H5E_DEFAULT, &func, NULL);
+#ifdef H5_USE_16_API_DEFAULT
+ H5Eget_auto(&func, NULL);
- H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+ H5Eset_auto(NULL, NULL);
+#else /* H5_USE_16_API_DEFAULT */
+ H5Eget_auto(H5E_DEFAULT, &func, NULL);
+
+ H5Eset_auto(H5E_DEFAULT, NULL, NULL);
+#endif /* H5_USE_16_API_DEFAULT */
if(H5Pget_data_transform(dxpl_id, ptrgetTest, HDstrlen(str) + 1) < 0)
PASSED()
@@ -693,7 +699,11 @@ test_set(void)
TESTING("H5Pset_data_transform (set with invalid transform 8)")
INVALID_SET_TEST("(9/5)*x + x^2");
- H5Eset_auto2(H5E_DEFAULT, func, NULL);
+#ifdef H5_USE_16_API_DEFAULT
+ H5Eset_auto(func, NULL);
+#else /* H5_USE_16_API_DEFAULT */
+ H5Eset_auto(H5E_DEFAULT, func, NULL);
+#endif /* H5_USE_16_API_DEFAULT */
if(H5Pclose(dxpl_id) < 0)
TEST_ERROR