diff options
| author | Kimmy Mu <kmu@hdfgroup.org> | 2020-01-06 18:17:10 (GMT) |
|---|---|---|
| committer | Kimmy Mu <kmu@hdfgroup.org> | 2020-01-06 18:17:10 (GMT) |
| commit | 127f07d64affc285e729923b514b4d7f3c19ceeb (patch) | |
| tree | cc3a3eef4845d8b6c134e15d60e97aece8a8455c /src/H5FAcache.c | |
| parent | 4f98de52d64a283b6ff63281c2e06365b3b94df0 (diff) | |
| parent | 0a2bb11b248df6841daabca3970df5d8504adfc7 (diff) | |
| download | hdf5-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 'src/H5FAcache.c')
| -rw-r--r-- | src/H5FAcache.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5FAcache.c b/src/H5FAcache.c index f440efe..2f0d1b4 100644 --- a/src/H5FAcache.c +++ b/src/H5FAcache.c @@ -417,7 +417,8 @@ H5FA__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le *image++ = H5FA_HDR_VERSION; /* Fixed array type */ - *image++ = hdr->cparam.cls->id; + HDassert(hdr->cparam.cls->id <= 255); + *image++ = (uint8_t)hdr->cparam.cls->id; /* General array creation/configuration information */ *image++ = hdr->cparam.raw_elmt_size; /* Element size in file (in bytes) */ @@ -805,7 +806,8 @@ H5FA__cache_dblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED *image++ = H5FA_DBLOCK_VERSION; /* Fixed array type */ - *image++ = dblock->hdr->cparam.cls->id; + HDassert(dblock->hdr->cparam.cls->id <= 255); + *image++ = (uint8_t)dblock->hdr->cparam.cls->id; /* Address of array header for array which owns this block */ H5F_addr_encode(f, &image, dblock->hdr->addr); |