diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-12-10 16:52:29 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-12-10 16:52:29 (GMT) |
| commit | 1ebb93f0f813e57a3ddc4450aa45494624c722c1 (patch) | |
| tree | 0a570ece66e6b2fa0496c4ee7bfc7fc312c6105b /testpar/t_dset.c | |
| parent | 671ba90ce4540284c2b995ab8a365f4af904cdee (diff) | |
| download | hdf5-1ebb93f0f813e57a3ddc4450aa45494624c722c1.zip hdf5-1ebb93f0f813e57a3ddc4450aa45494624c722c1.tar.gz hdf5-1ebb93f0f813e57a3ddc4450aa45494624c722c1.tar.bz2 | |
[svn-r7923] Purpose:
Bug fix
Description:
Clean up a couple more 1.6 compat bugs that showed up when the library
was compiled with parallel support.
Platforms tested:
FreeBSD 4.9 (sleipnir) w/parallel & 1.6 compat
config not tested with h5committest
Diffstat (limited to 'testpar/t_dset.c')
| -rw-r--r-- | testpar/t_dset.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/testpar/t_dset.c b/testpar/t_dset.c index 829e7c6..66bdb01 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -1236,8 +1236,13 @@ extend_writeInd(char *filename) /* Try write to dataset2 beyond its current dim sizes. Should fail. */ /* Temporary turn off auto error reporting */ +#ifdef H5_WANT_H5_V1_6_COMPAT + H5Eget_auto(&old_func, &old_client_data); + H5Eset_auto(NULL, NULL); +#else /* H5_WANT_H5_V1_6_COMPAT */ H5Eget_auto(H5E_DEFAULT, &old_func, &old_client_data); H5Eset_auto(H5E_DEFAULT, NULL, NULL); +#endif /* H5_WANT_H5_V1_6_COMPAT */ /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset2); @@ -1251,7 +1256,11 @@ extend_writeInd(char *filename) VRFY((ret < 0), "H5Dwrite failed as expected"); /* restore auto error reporting */ +#ifdef H5_WANT_H5_V1_6_COMPAT + H5Eset_auto(old_func, old_client_data); +#else /* H5_WANT_H5_V1_6_COMPAT */ H5Eset_auto(H5E_DEFAULT, old_func, old_client_data); +#endif /* H5_WANT_H5_V1_6_COMPAT */ H5Sclose(file_dataspace); /* Extend dataset2 and try again. Should succeed. */ @@ -1356,8 +1365,13 @@ extend_readInd(char *filename) /* Try extend dataset1 which is open RDONLY. Should fail. */ /* first turn off auto error reporting */ +#ifdef H5_WANT_H5_V1_6_COMPAT + H5Eget_auto(&old_func, &old_client_data); + H5Eset_auto(NULL, NULL); +#else /* H5_WANT_H5_V1_6_COMPAT */ H5Eget_auto(H5E_DEFAULT, &old_func, &old_client_data); H5Eset_auto(H5E_DEFAULT, NULL, NULL); +#endif /* H5_WANT_H5_V1_6_COMPAT */ file_dataspace = H5Dget_space (dataset1); VRFY((file_dataspace >= 0), "H5Dget_space succeeded"); @@ -1368,7 +1382,11 @@ extend_readInd(char *filename) VRFY((ret < 0), "H5Dextend failed as expected"); /* restore auto error reporting */ +#ifdef H5_WANT_H5_V1_6_COMPAT + H5Eset_auto(old_func, old_client_data); +#else /* H5_WANT_H5_V1_6_COMPAT */ H5Eset_auto(H5E_DEFAULT, old_func, old_client_data); +#endif /* H5_WANT_H5_V1_6_COMPAT */ H5Sclose(file_dataspace); @@ -1651,8 +1669,13 @@ extend_writeAll(char *filename) /* Try write to dataset2 beyond its current dim sizes. Should fail. */ /* Temporary turn off auto error reporting */ +#ifdef H5_WANT_H5_V1_6_COMPAT + H5Eget_auto(&old_func, &old_client_data); + H5Eset_auto(NULL, NULL); +#else /* H5_WANT_H5_V1_6_COMPAT */ H5Eget_auto(H5E_DEFAULT, &old_func, &old_client_data); H5Eset_auto(H5E_DEFAULT, NULL, NULL); +#endif /* H5_WANT_H5_V1_6_COMPAT */ /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset2); @@ -1666,7 +1689,11 @@ extend_writeAll(char *filename) VRFY((ret < 0), "H5Dwrite failed as expected"); /* restore auto error reporting */ +#ifdef H5_WANT_H5_V1_6_COMPAT + H5Eset_auto(old_func, old_client_data); +#else /* H5_WANT_H5_V1_6_COMPAT */ H5Eset_auto(H5E_DEFAULT, old_func, old_client_data); +#endif /* H5_WANT_H5_V1_6_COMPAT */ H5Sclose(file_dataspace); /* Extend dataset2 and try again. Should succeed. */ @@ -1774,8 +1801,13 @@ extend_readAll(char *filename) /* Try extend dataset1 which is open RDONLY. Should fail. */ /* first turn off auto error reporting */ +#ifdef H5_WANT_H5_V1_6_COMPAT + H5Eget_auto(&old_func, &old_client_data); + H5Eset_auto(NULL, NULL); +#else /* H5_WANT_H5_V1_6_COMPAT */ H5Eget_auto(H5E_DEFAULT, &old_func, &old_client_data); H5Eset_auto(H5E_DEFAULT, NULL, NULL); +#endif /* H5_WANT_H5_V1_6_COMPAT */ file_dataspace = H5Dget_space (dataset1); VRFY((file_dataspace >= 0), "H5Dget_space succeeded"); @@ -1786,7 +1818,11 @@ extend_readAll(char *filename) VRFY((ret < 0), "H5Dextend failed as expected"); /* restore auto error reporting */ +#ifdef H5_WANT_H5_V1_6_COMPAT + H5Eset_auto(old_func, old_client_data); +#else /* H5_WANT_H5_V1_6_COMPAT */ H5Eset_auto(H5E_DEFAULT, old_func, old_client_data); +#endif /* H5_WANT_H5_V1_6_COMPAT */ H5Sclose(file_dataspace); |