diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-02-04 17:00:46 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-02-04 17:00:46 (GMT) |
| commit | 5cac69efe847c356752f4b7d76cb6f4ebbf40615 (patch) | |
| tree | 89ee209d70325de64a4c818118e03015ca662a29 /testpar | |
| parent | 20ebc34e01601a7d7d67b925e47227ad9e17110b (diff) | |
| parent | d42bee368850f0bf47ee3a708e3c5d8b7119a632 (diff) | |
| download | hdf5-5cac69efe847c356752f4b7d76cb6f4ebbf40615.zip hdf5-5cac69efe847c356752f4b7d76cb6f4ebbf40615.tar.gz hdf5-5cac69efe847c356752f4b7d76cb6f4ebbf40615.tar.bz2 | |
Merge pull request #2334 in HDFFV/hdf5 from ~DYOUNG/werror:hdf5_1_12-warnings-squashed to hdf5_1_12
* commit 'd42bee368850f0bf47ee3a708e3c5d8b7119a632':
Squashed commit of the following:
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_bigio.c | 4 | ||||
| -rw-r--r-- | testpar/testpar.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c index ada832c..f86852a 100644 --- a/testpar/t_bigio.c +++ b/testpar/t_bigio.c @@ -15,7 +15,7 @@ const char *FILENAME[3]={ "bigio_test.h5", /* Define some handy debugging shorthands, routines, ... */ /* debugging tools */ -#define MAIN_PROCESS (!mpi_rank_g) /* define process 0 as main process */ +#define MAIN_PROCESS (mpi_rank_g == 0) /* define process 0 as main process */ /* Constants definitions */ #define RANK 2 @@ -1131,7 +1131,7 @@ single_rank_independent_io(void) void *data = NULL; fapl_id = H5Pcreate(H5P_FILE_ACCESS); - VRFY_G((fapl_id >= 0), "H5P_FILE_ACCESS"); + VRFY_G((fapl_id >= 0), "H5P_FILE_ACCESS"); H5Pset_fapl_mpio(fapl_id, MPI_COMM_SELF, MPI_INFO_NULL); file_id = H5Fcreate(FILENAME[1], H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id); diff --git a/testpar/testpar.h b/testpar/testpar.h index e3d68e0..2c1bce2 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_IMPL(val, mesg, rankvar) do { \ +#define VRFY_IMPL(val, mesg, rankvar) do { \ if (val) { \ MESG(mesg); \ } \ else { \ - HDprintf("Proc %d: ", rankvar); \ + HDprintf("Proc %d: ", rankvar); \ HDprintf("*** Parallel ERROR ***\n"); \ HDprintf(" VRFY (%s) failed at line %4d in %s\n", \ mesg, (int)__LINE__, __FILE__); \ |