summaryrefslogtreecommitdiffstats
path: root/tools/test/h5repack
diff options
context:
space:
mode:
authorKimmy Mu <kmu@hdfgroup.org>2020-01-06 18:17:10 (GMT)
committerkmu <kmu@hdfgroup.org>2020-01-08 20:06:38 (GMT)
commitad80fae3cc0ece39f510612083cabacd9e059aeb (patch)
tree67053c97d6b0271dd05be115d87e9d831fbc4927 /tools/test/h5repack
parent97c0b13af6e4471e738dd96180cf42398dc05908 (diff)
downloadhdf5-ad80fae3cc0ece39f510612083cabacd9e059aeb.zip
hdf5-ad80fae3cc0ece39f510612083cabacd9e059aeb.tar.gz
hdf5-ad80fae3cc0ece39f510612083cabacd9e059aeb.tar.bz2
Merge pull request #2071 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings to develop
* commit '0a2bb11b248df6841daabca3970df5d8504adfc7': address problems from comments fix and address comments change according to previous comments add missing piece remove unnecessary check macro fix intel compile warnings Revert "fix warnings from Intel compiler" Revert "fix warnings and some text alignment" Revert "let hdf5 pick up the right compiler in Intel environment" Revert "fix issues from previous PR comments" Revert "using a different MACRO" using a different MACRO fix issues from previous PR comments let hdf5 pick up the right compiler in Intel environment fix warnings and some text alignment fix warnings from Intel compiler
Diffstat (limited to 'tools/test/h5repack')
-rw-r--r--tools/test/h5repack/h5repackgentest.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c
index aaac285..77fb28a 100644
--- a/tools/test/h5repack/h5repackgentest.c
+++ b/tools/test/h5repack/h5repackgentest.c
@@ -266,7 +266,7 @@ generate_uint8be(hbool_t external) {
for (i = 0, n = 0; i < dims[0]; i++) {
for (j = 0; j < dims[1]; j++) {
for (k = 0; k < dims[2]; k++, n++) {
- wdata[n] = n * ((n & 1) ? (-1) : (1));
+ wdata[n] = (uint8_t)((n & 1) ? -n : n);
}
}
}
@@ -296,7 +296,7 @@ generate_f32le(hbool_t external) {
/* Generate values */
for (i = 0, k = 0, n = 0; i < dims[0]; i++) {
for (j = 0; j < dims[1]; j++, k++, n++) {
- wdata[k] = n * 801.1 * ((k % 5 == 1) ? (-1) : (1));
+ wdata[k] = (float)(n * 801.1 * ((k % 5 == 1) ? (-1) : (1)));
}
}