diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2003-12-31 19:42:19 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2003-12-31 19:42:19 (GMT) |
| commit | 7a510bcb4d3faa3b1393a97fcc5b2e40d42b0133 (patch) | |
| tree | 66ff53ad7f90e31dfba1b8a850698d866a15e1e6 | |
| parent | 7bcc111c2b0db85b21c229dcf1e1f7a82f27b2fc (diff) | |
| download | hdf5-7a510bcb4d3faa3b1393a97fcc5b2e40d42b0133.zip hdf5-7a510bcb4d3faa3b1393a97fcc5b2e40d42b0133.tar.gz hdf5-7a510bcb4d3faa3b1393a97fcc5b2e40d42b0133.tar.bz2 | |
[svn-r8003] Purpose:
Code cleanup.
Description:
The H5Eclear() in the VRFY and INFO macros are not needed.
After removing them, there is no need to have a separate
v1.6 Compat version.
Platforms tested:
"h5committested"
Misc. update:
| -rw-r--r-- | testpar/testphdf5.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h index bb5164a..e82644a 100644 --- a/testpar/testphdf5.h +++ b/testpar/testphdf5.h @@ -33,7 +33,6 @@ #define MESG(x) \ if (verbose) printf("%s\n", x); \ -#ifdef H5_WANT_H5_V1_6_COMPAT #define VRFY(val, mesg) do { \ if (val) { \ if (*mesg != '\0') { \ @@ -52,52 +51,13 @@ exit(nerrors); \ } \ } \ - H5Eclear(); \ } while(0) -#else /* H5_WANT_H5_V1_6_COMPAT */ -#define VRFY(val, mesg) do { \ - if (val) { \ - if (*mesg != '\0') { \ - MESG(mesg); \ - } \ - } else { \ - printf("Proc %d: ", mpi_rank); \ - printf("*** PHDF5 ERROR ***\n"); \ - printf(" Assertion (%s) failed at line %4d in %s\n", \ - mesg, (int)__LINE__, __FILE__); \ - ++nerrors; \ - fflush(stdout); \ - if (!verbose) { \ - printf("aborting MPI process\n"); \ - MPI_Finalize(); \ - exit(nerrors); \ - } \ - } \ - H5Eclear(H5E_DEFAULT); \ -} while(0) -#endif /* H5_WANT_H5_V1_6_COMPAT */ /* * Checking for information purpose. * If val is false, print mesg; else nothing. * Either case, no error setting. */ -#ifdef H5_WANT_H5_V1_6_COMPAT -#define INFO(val, mesg) do { \ - if (val) { \ - if (*mesg != '\0') { \ - MESG(mesg); \ - } \ - } else { \ - printf("Proc %d: ", mpi_rank); \ - printf("*** PHDF5 REMARK (not an error) ***\n"); \ - printf(" Condition (%s) failed at line %4d in %s\n", \ - mesg, (int)__LINE__, __FILE__); \ - fflush(stdout); \ - } \ - H5Eclear(); \ -} while(0) -#else /* H5_WANT_H5_V1_6_COMPAT */ #define INFO(val, mesg) do { \ if (val) { \ if (*mesg != '\0') { \ @@ -110,9 +70,7 @@ mesg, (int)__LINE__, __FILE__); \ fflush(stdout); \ } \ - H5Eclear(H5E_DEFAULT); \ } while(0) -#endif /* H5_WANT_H5_V1_6_COMPAT */ #define MPI_BANNER(mesg) do { \ printf("--------------------------------\n"); \ |