diff options
| author | Kimmy Mu <kmu@hdfgroup.org> | 2020-01-24 01:42:50 (GMT) |
|---|---|---|
| committer | Kimmy Mu <kmu@hdfgroup.org> | 2020-01-24 01:42:50 (GMT) |
| commit | d038d8510032696e4defd86f1906e7d4fa133ba9 (patch) | |
| tree | a77fdb4be46d9c9c8d4d592088583e490abc561c /src/H5Oint.c | |
| parent | 037a883bd4d58061e11183b1d67d7f0cc17ddd99 (diff) | |
| parent | 48cc850199901c5b67a40183262f4ead975b884f (diff) | |
| download | hdf5-d038d8510032696e4defd86f1906e7d4fa133ba9.zip hdf5-d038d8510032696e4defd86f1906e7d4fa133ba9.tar.gz hdf5-d038d8510032696e4defd86f1906e7d4fa133ba9.tar.bz2 | |
Merge pull request #2238 in HDFFV/hdf5 from ~KMU/hdf5:hdf5_1_12 to hdf5_1_12
* commit '48cc850199901c5b67a40183262f4ead975b884f':
fix test assert fail error
Merge pull request #2071 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings to develop
Merge pull request #2234 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings to develop
Diffstat (limited to 'src/H5Oint.c')
| -rw-r--r-- | src/H5Oint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Oint.c b/src/H5Oint.c index 1248952e..255f5b7 100644 --- a/src/H5Oint.c +++ b/src/H5Oint.c @@ -250,7 +250,7 @@ H5O_set_version(H5F_t *f, H5O_t *oh, uint8_t oh_flags, hbool_t store_msg_crt_idx version = H5O_VERSION_1; /* Upgrade to the version indicated by the file's low bound if higher */ - version = MAX(version, (uint8_t)H5O_obj_ver_bounds[H5F_LOW_BOUND(f)]); + version = (uint8_t)MAX(version, (uint8_t)H5O_obj_ver_bounds[H5F_LOW_BOUND(f)]); /* Version bounds check */ if(version > H5O_obj_ver_bounds[H5F_HIGH_BOUND(f)]) @@ -2375,7 +2375,7 @@ H5O_get_create_plist(const H5O_loc_t *loc, H5P_genplist_t *oc_plist) HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set min. # of dense attributes in property list") /* Mask off non-"user visible" flags */ - ohdr_flags = oh->flags & (H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED | H5O_HDR_STORE_TIMES); + H5_CHECKED_ASSIGN(ohdr_flags, uint8_t, oh->flags & (H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED | H5O_HDR_STORE_TIMES), int); /* Set object header flags */ if(H5P_set(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0) |