diff options
| author | Kimmy Mu <kmu@hdfgroup.org> | 2020-01-28 19:28:26 (GMT) |
|---|---|---|
| committer | Kimmy Mu <kmu@hdfgroup.org> | 2020-01-28 19:28:26 (GMT) |
| commit | 71c050f837149a0c11e0936e661047c091deaa2f (patch) | |
| tree | 05bc0afc7c0907369e7e6ac2953689229e63d76f /testpar/testpar.h | |
| parent | 57dd6d9864f79a4c4d89865978628219145a1ab0 (diff) | |
| parent | 406330addf45529ecdd088f4d22e9aab9a03661d (diff) | |
| download | hdf5-71c050f837149a0c11e0936e661047c091deaa2f.zip hdf5-71c050f837149a0c11e0936e661047c091deaa2f.tar.gz hdf5-71c050f837149a0c11e0936e661047c091deaa2f.tar.bz2 | |
Merge pull request #2311 in HDFFV/hdf5 from ~KMU/hdf5:misc to develop
* commit '406330addf45529ecdd088f4d22e9aab9a03661d':
rename macro
change condition
pick up from Dave's fix
leave Wswitch-default for later fix
fix Wredundant-decls, Wswitch-default, Wdeclaration-after-statement, Wsign-compare, Wmisleading-indentation, Wshadow
Diffstat (limited to 'testpar/testpar.h')
| -rw-r--r-- | testpar/testpar.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/testpar/testpar.h b/testpar/testpar.h index 86677d1..e3d68e0 100644 --- a/testpar/testpar.h +++ b/testpar/testpar.h @@ -44,12 +44,12 @@ * This will allow program to continue and can be used for debugging. * (The "do {...} while(0)" is to group all the statements as one unit.) */ -#define VRFY(val, mesg) do { \ +#define VRFY_IMPL(val, mesg, rankvar) do { \ if (val) { \ MESG(mesg); \ } \ else { \ - HDprintf("Proc %d: ", mpi_rank); \ + HDprintf("Proc %d: ", rankvar); \ HDprintf("*** Parallel ERROR ***\n"); \ HDprintf(" VRFY (%s) failed at line %4d in %s\n", \ mesg, (int)__LINE__, __FILE__); \ @@ -62,6 +62,9 @@ } \ } while(0) +#define VRFY_G(val, mesg) VRFY_IMPL(val, mesg, mpi_rank_g) +#define VRFY(val, mesg) VRFY_IMPL(val, mesg, mpi_rank) + /* * Checking for information purpose. * If val is false, print mesg; else nothing. |