diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2019-07-10 03:21:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2019-07-10 03:21:33 (GMT) |
| commit | 22d78bdfa4d560a0b8a2dbb547574bfe61bf64f0 (patch) | |
| tree | 43f503fea615b405e03863e1befc1c91bd9f65ef /src/H5Fpkg.h | |
| parent | c33f2cbf18b4cc0aafedfe2d1cc29ed7730c91f6 (diff) | |
| parent | 73df02f13c2b1e0b256cdbff1c7c584e84548df4 (diff) | |
| download | hdf5-22d78bdfa4d560a0b8a2dbb547574bfe61bf64f0.zip hdf5-22d78bdfa4d560a0b8a2dbb547574bfe61bf64f0.tar.gz hdf5-22d78bdfa4d560a0b8a2dbb547574bfe61bf64f0.tar.bz2 | |
Merge pull request #1788 in HDFFV/hdf5 from ~KOZIOL/hdf5:feature/update_gcc_flags to develop
* commit '73df02f13c2b1e0b256cdbff1c7c584e84548df4':
Updates to warnhist script, along with a few cleanups, and add some comments to warning cleanups that are a bit obscure.
Cleaned up code that genericizes warning output, and add "-u" option to leave unique types in warnings (i.e. don't genericize output). Also fixed the '-S' option to work correctly.
Added GCC9 flags to CMake build
Add support for GCC9, update warnhist script, and clean up warnings.
Diffstat (limited to 'src/H5Fpkg.h')
| -rw-r--r-- | src/H5Fpkg.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index 5f25ddc..1dd07c1 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -140,14 +140,14 @@ /* For superblock version 0 & 1: Offset to the file consistency flags (status_flags) in the superblock (excluding H5F_SUPERBLOCK_FIXED_SIZE) */ -#define H5F_SUPER_STATUS_OFF_V01 \ - (2 /* freespace, and root group versions */ \ - + 1 /* reserved */ \ - + 3 /* shared header vers, size of address, size of lengths */ \ - + 1 /* reserved */ \ - + 4) /* group leaf k, group internal k */ - -#define H5F_SUPER_STATUS_OFF(v) (v >= 2 ? 2 : H5F_SUPER_STATUS_OFF_V01) +#define H5F_SUPER_STATUS_OFF_V01 \ + (unsigned)(2 /* freespace, and root group versions */ \ + + 1 /* reserved */ \ + + 3 /* shared header vers, size of address, size of lengths */ \ + + 1 /* reserved */ \ + + 4) /* group leaf k, group internal k */ + +#define H5F_SUPER_STATUS_OFF(v) (v >= 2 ? (unsigned)2 : H5F_SUPER_STATUS_OFF_V01) /* Offset to the file consistency flags (status_flags) in the superblock */ #define H5F_SUPER_STATUS_FLAGS_OFF(v) (H5F_SUPERBLOCK_FIXED_SIZE + H5F_SUPER_STATUS_OFF(v)) |