diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2004-01-22 23:11:39 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2004-01-22 23:11:39 (GMT) |
| commit | f3113c02d5df98d554aee9fa23beba9f39ae9e2a (patch) | |
| tree | 3c6abc56c09fc4d3e750c1d8ce34c77b57679359 /testpar/testphdf5.h | |
| parent | cc171677031c2bff1ae60a45f510492733fe76d7 (diff) | |
| download | hdf5-f3113c02d5df98d554aee9fa23beba9f39ae9e2a.zip hdf5-f3113c02d5df98d554aee9fa23beba9f39ae9e2a.tar.gz hdf5-f3113c02d5df98d554aee9fa23beba9f39ae9e2a.tar.bz2 | |
[svn-r8096] Purpose:
Improvement.
Description:
Complete change of the verbose control to use the routines provided by
the test/libh5test.a.
Also put in a temporary fix for the H5Eset_auto() and H5Eget_auto()
so that the Compat code are isolated in one place rather than all over
the source file.
Platforms tested:
Tested in Eirene (parallel).
Misc. update:
Diffstat (limited to 'testpar/testphdf5.h')
| -rw-r--r-- | testpar/testphdf5.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h index c6069d5..d08a77c 100644 --- a/testpar/testphdf5.h +++ b/testpar/testphdf5.h @@ -27,11 +27,20 @@ #define FALSE (!TRUE) #endif /* !FALSE */ +/* temporary fix for restoring the H5EXXX API. */ +/* An ISO compliant compiler should handle the repeated name correctly. */ +/* If it barks at it, try change the second name to something like */ +/* H5E/@@/xxx where '@' is actually '*'. */ +#ifndef H5_WANT_H5_V1_6_COMPAT +#define H5Eget_auto(func, data) H5Eget_auto(H5E_DEFAULT, func, data) +#define H5Eset_auto(func, data) H5Eset_auto(H5E_DEFAULT, func, data) +#endif + /* Define some handy debugging shorthands, routines, ... */ /* debugging tools */ #define MESG(x) \ - if (verbose) printf("%s\n", x); \ + if (VERBOSE_MED) printf("%s\n", x); \ #define VRFY(val, mesg) do { \ if (val) { \ @@ -45,7 +54,7 @@ mesg, (int)__LINE__, __FILE__); \ ++nerrors; \ fflush(stdout); \ - if (!verbose) { \ + if (!VERBOSE_MED) { \ printf("aborting MPI process\n"); \ MPI_Finalize(); \ exit(nerrors); \ @@ -119,7 +128,6 @@ typedef int DATATYPE; extern int dim0, dim1; /*Dataset dimensions */ extern int chunkdim0, chunkdim1; /*Chunk dimensions */ extern int nerrors; /*errors count */ -extern int verbose; /*verbose, default as no. */ extern H5E_auto_t old_func; /* previous error handler */ extern void *old_client_data; /*previous error handler arg.*/ extern int facc_type; /*Test file access type */ |