summaryrefslogtreecommitdiffstats
path: root/tools/src
diff options
context:
space:
mode:
authorKimmy Mu <kmu@hdfgroup.org>2020-01-06 18:17:10 (GMT)
committerKimmy Mu <kmu@hdfgroup.org>2020-01-06 18:17:10 (GMT)
commit127f07d64affc285e729923b514b4d7f3c19ceeb (patch)
treecc3a3eef4845d8b6c134e15d60e97aece8a8455c /tools/src
parent4f98de52d64a283b6ff63281c2e06365b3b94df0 (diff)
parent0a2bb11b248df6841daabca3970df5d8504adfc7 (diff)
downloadhdf5-127f07d64affc285e729923b514b4d7f3c19ceeb.zip
hdf5-127f07d64affc285e729923b514b4d7f3c19ceeb.tar.gz
hdf5-127f07d64affc285e729923b514b4d7f3c19ceeb.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/src')
-rw-r--r--tools/src/h5import/h5import.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index 1eef5ab..bd1689f 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -4707,14 +4707,14 @@ static int process(struct Options *opt)
return (0);
}
-uint16_t swap_uint16( uint16_t val)
+uint16_t swap_uint16(uint16_t val)
{
- return (val << 8) | (val >> 8);
+ return (uint16_t)((val << 8) | (val >> 8));
}
int16_t swap_int16(int16_t val)
{
- return (val << 8) | ((val >> 8) & 0xFF);
+ return (int16_t)((val << 8) | ((val >> 8) & 0xFF));
}
uint32_t swap_uint32(uint32_t val)