summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKimmy Mu <kmu@hdfgroup.org>2020-01-09 21:31:19 (GMT)
committerkmu <kmu@hdfgroup.org>2020-01-10 03:22:19 (GMT)
commit6d790e5c85c4e590475a3864d82f16ffd0937cc1 (patch)
tree75361b279aec7b5ec2b5efd16afca9e8ac50b5b1
parent6710ed5e0a03de50a5679c92437df82893da6813 (diff)
downloadhdf5-6d790e5c85c4e590475a3864d82f16ffd0937cc1.zip
hdf5-6d790e5c85c4e590475a3864d82f16ffd0937cc1.tar.gz
hdf5-6d790e5c85c4e590475a3864d82f16ffd0937cc1.tar.bz2
Merge pull request #2244 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings to develop
* commit '6b1b4b3c0bdd803835efe8c531965bb9900a5363': fix test assert fail error
-rw-r--r--testpar/t_mpi.c4
-rw-r--r--tools/test/h5dump/h5dumpgentest.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index 91b8f8c..fe78317 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -303,7 +303,7 @@ static int test_mpio_gb_file(char *filename) {
mpi_rank, mpi_off, mpi_off);
/* set data to some trivial pattern for easy verification */
for (j = 0; j < MB; j++)
- H5_CHECKED_ASSIGN(*(buf + j), int8_t, i * mpi_size + mpi_rank, int);
+ *(buf + j) = (int8_t)(i * mpi_size + mpi_rank);
if (VERBOSE_MED)
HDfprintf(stdout,
"proc %d: writing %d bytes at offset %lld\n",
@@ -351,7 +351,7 @@ static int test_mpio_gb_file(char *filename) {
mrc = MPI_File_read_at(fh, mpi_off, buf, MB, MPI_BYTE,
&mpi_stat);
INFO((mrc == MPI_SUCCESS), "GB size file read");
- H5_CHECKED_ASSIGN(expected, int8_t, i * mpi_size + (mpi_size - mpi_rank - 1), int);
+ expected = (int8_t)(i * mpi_size + (mpi_size - mpi_rank - 1));
vrfyerrs = 0;
for (j = 0; j < MB; j++) {
if ((*(buf + j) != expected)
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 220937d..611dd10 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -10488,7 +10488,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
/* Subtract the original value with MULTIPLIER */
while(buf_left > 0) {
char temp = *int_ptr;
- H5_CHECKED_ASSIGN(*int_ptr, int8_t, temp - MULTIPLIER, int);
+ *int_ptr = (int8_t)(temp - MULTIPLIER);
int_ptr++;
buf_left -= sizeof(*int_ptr);
} /* end while */
@@ -10497,7 +10497,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
/* Add the original value with MULTIPLIER */
while(buf_left > 0) {
char temp = *int_ptr;
- H5_CHECKED_ASSIGN(*int_ptr, int8_t, temp + MULTIPLIER, int);
+ *int_ptr = (int8_t)(temp + MULTIPLIER);
int_ptr++;
buf_left -= sizeof(*int_ptr);
} /* end while */