summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
Diffstat (limited to 'testpar')
-rw-r--r--testpar/t_dset.c24
-rw-r--r--testpar/testphdf5.h4
2 files changed, 14 insertions, 14 deletions
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 7167782..829e7c6 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -1236,8 +1236,8 @@ extend_writeInd(char *filename)
/* Try write to dataset2 beyond its current dim sizes. Should fail. */
/* Temporary turn off auto error reporting */
- H5Eget_auto(&old_func, &old_client_data);
- H5Eset_auto(NULL, NULL);
+ H5Eget_auto(H5E_DEFAULT, &old_func, &old_client_data);
+ H5Eset_auto(H5E_DEFAULT, NULL, NULL);
/* create a file dataspace independently */
file_dataspace = H5Dget_space (dataset2);
@@ -1251,7 +1251,7 @@ extend_writeInd(char *filename)
VRFY((ret < 0), "H5Dwrite failed as expected");
/* restore auto error reporting */
- H5Eset_auto(old_func, old_client_data);
+ H5Eset_auto(H5E_DEFAULT, old_func, old_client_data);
H5Sclose(file_dataspace);
/* Extend dataset2 and try again. Should succeed. */
@@ -1356,8 +1356,8 @@ extend_readInd(char *filename)
/* Try extend dataset1 which is open RDONLY. Should fail. */
/* first turn off auto error reporting */
- H5Eget_auto(&old_func, &old_client_data);
- H5Eset_auto(NULL, NULL);
+ H5Eget_auto(H5E_DEFAULT, &old_func, &old_client_data);
+ H5Eset_auto(H5E_DEFAULT, NULL, NULL);
file_dataspace = H5Dget_space (dataset1);
VRFY((file_dataspace >= 0), "H5Dget_space succeeded");
@@ -1368,7 +1368,7 @@ extend_readInd(char *filename)
VRFY((ret < 0), "H5Dextend failed as expected");
/* restore auto error reporting */
- H5Eset_auto(old_func, old_client_data);
+ H5Eset_auto(H5E_DEFAULT, old_func, old_client_data);
H5Sclose(file_dataspace);
@@ -1651,8 +1651,8 @@ extend_writeAll(char *filename)
/* Try write to dataset2 beyond its current dim sizes. Should fail. */
/* Temporary turn off auto error reporting */
- H5Eget_auto(&old_func, &old_client_data);
- H5Eset_auto(NULL, NULL);
+ H5Eget_auto(H5E_DEFAULT, &old_func, &old_client_data);
+ H5Eset_auto(H5E_DEFAULT, NULL, NULL);
/* create a file dataspace independently */
file_dataspace = H5Dget_space (dataset2);
@@ -1666,7 +1666,7 @@ extend_writeAll(char *filename)
VRFY((ret < 0), "H5Dwrite failed as expected");
/* restore auto error reporting */
- H5Eset_auto(old_func, old_client_data);
+ H5Eset_auto(H5E_DEFAULT, old_func, old_client_data);
H5Sclose(file_dataspace);
/* Extend dataset2 and try again. Should succeed. */
@@ -1774,8 +1774,8 @@ extend_readAll(char *filename)
/* Try extend dataset1 which is open RDONLY. Should fail. */
/* first turn off auto error reporting */
- H5Eget_auto(&old_func, &old_client_data);
- H5Eset_auto(NULL, NULL);
+ H5Eget_auto(H5E_DEFAULT, &old_func, &old_client_data);
+ H5Eset_auto(H5E_DEFAULT, NULL, NULL);
file_dataspace = H5Dget_space (dataset1);
VRFY((file_dataspace >= 0), "H5Dget_space succeeded");
@@ -1786,7 +1786,7 @@ extend_readAll(char *filename)
VRFY((ret < 0), "H5Dextend failed as expected");
/* restore auto error reporting */
- H5Eset_auto(old_func, old_client_data);
+ H5Eset_auto(H5E_DEFAULT, old_func, old_client_data);
H5Sclose(file_dataspace);
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index ccf0191..afbce3e 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -51,7 +51,7 @@
MPI_Finalize(); exit(nerrors); \
} \
} \
- H5Eclear(); \
+ H5Eclear(H5E_DEFAULT); \
} while(0)
/*
@@ -72,7 +72,7 @@
mesg, (int)__LINE__, __FILE__); \
fflush(stdout); \
} \
- H5Eclear(); \
+ H5Eclear(H5E_DEFAULT); \
} while(0)
#define MPI_BANNER(mesg)\