diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-03-01 15:24:19 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-03-01 15:24:19 (GMT) |
| commit | 561af682429998c170cde5c20f6caf3750fcdf42 (patch) | |
| tree | 3878ee8d4f951310549364ca61f562c5eba8cde4 /testpar | |
| parent | d9774f3852ad97a5ad99b037f501f272c8a82fd8 (diff) | |
| parent | 42106363903e7a7d4a0c2cd1b38aad9a54f2eeff (diff) | |
| download | hdf5-561af682429998c170cde5c20f6caf3750fcdf42.zip hdf5-561af682429998c170cde5c20f6caf3750fcdf42.tar.gz hdf5-561af682429998c170cde5c20f6caf3750fcdf42.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '42106363903e7a7d4a0c2cd1b38aad9a54f2eeff':
Fixed configure issue when building HDF5 with NAG Fortran 7.0.
Fixed issue building HDF5 with NAG Fortran 7.0.
revert type cast
Merge pull request #2244 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings to develop
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_mpi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index fe78317..8735cbb 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -526,7 +526,7 @@ static int test_mpio_1wMr(char *filename, int special_request) { * ==================================================*/ irank = 0; for (i = 0; i < DIMSIZE; i++) - H5_CHECKED_ASSIGN(writedata[i], uint8_t, irank * DIMSIZE + i, int) + writedata[i] = irank * DIMSIZE + i; mpi_off = irank * DIMSIZE; /* Only one process writes */ @@ -597,7 +597,7 @@ static int test_mpio_1wMr(char *filename, int special_request) { return 1; }; for (i = 0; i < DIMSIZE; i++) { - H5_CHECKED_ASSIGN(expect_val, uint8_t, irank * DIMSIZE + i, int); + expect_val = (uint8_t)(irank * DIMSIZE + i); if (readdata[i] != expect_val) { PRINTID; HDprintf("read data[%d:%d] got %02x, expect %02x\n", irank, i, @@ -697,7 +697,7 @@ static int test_mpio_derived_dtype(char *filename) { MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); retcode = 0; for (i = 0; i < 3; i++) - H5_CHECKED_ASSIGN(buf[i], int8_t, i + 1, int); + buf[i] = (char)(i + 1); if ((mpi_err = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDWR | MPI_MODE_CREATE, MPI_INFO_NULL, &fh)) |