diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-20 21:57:57 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-20 21:57:57 (GMT) |
| commit | d688fc55a94acc6bdf43607e5224bc28009ee5e8 (patch) | |
| tree | e46dc5152aafe70254b02c330bcf5fa2ecf6d892 /test/flush2.c | |
| parent | d3d78bbd1be7dddd41b2a9f7e25ea42ce2192ddd (diff) | |
| download | hdf5-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/flush2.c')
| -rw-r--r-- | test/flush2.c | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/test/flush2.c b/test/flush2.c index 5675856..c674426 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -158,7 +158,7 @@ int main(void) { hid_t fapl; - H5E_auto2_t func; + H5E_auto_t func; char name[1024]; h5_reset(); @@ -178,8 +178,14 @@ main(void) /* Check the case where the file was not flushed. This should give an error * so we turn off the error stack temporarily */ TESTING("H5Fflush (part2 without flush)"); - H5Eget_auto2(H5E_DEFAULT,&func,NULL); - H5Eset_auto2(H5E_DEFAULT, NULL, NULL); + +#ifdef H5_USE_16_API_DEFAULT + H5Eget_auto(&func,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 */ h5_fixname(FILENAME[1], fapl, name, sizeof name); if(check_file(name, fapl, FALSE)) @@ -196,13 +202,23 @@ main(void) goto error; #endif } - 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 */ /* Check the case where the file was flushed, but more data was added afterward. This should give an error * so we turn off the error stack temporarily */ TESTING("H5Fflush (part2 with flush and later addition)"); - H5Eget_auto2(H5E_DEFAULT,&func,NULL); - H5Eset_auto2(H5E_DEFAULT, NULL, NULL); + +#ifdef H5_USE_16_API_DEFAULT + H5Eget_auto(&func,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 */ h5_fixname(FILENAME[2], fapl, name, sizeof name); if(check_file(name, fapl, TRUE)) @@ -220,7 +236,12 @@ main(void) #endif } - 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 */ + h5_cleanup(FILENAME, fapl); |