diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-01-02 17:42:23 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-01-02 17:42:23 (GMT) |
| commit | 041b14c876cc7466da7868ef563563c879951ad6 (patch) | |
| tree | 6531f1aba7b5b237d42209f686f7661670c46a7d | |
| parent | 1e0a2d37ae5ded1e85ea88479e0b991290c13bfc (diff) | |
| parent | 1a50056dafc8e22facda675acb43a71705fdd15c (diff) | |
| download | hdf5-041b14c876cc7466da7868ef563563c879951ad6.zip hdf5-041b14c876cc7466da7868ef563563c879951ad6.tar.gz hdf5-041b14c876cc7466da7868ef563563c879951ad6.tar.bz2 | |
Merge pull request #2221 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop
* commit '1a50056dafc8e22facda675acb43a71705fdd15c':
Changed -Wformat-truncation to level 2 in CMake w/ gcc.
Changed -Wformat-truncation's level from 2 to 1.
| -rw-r--r-- | config/cmake/HDFCompilerFlags.cmake | 2 | ||||
| -rw-r--r-- | config/gnu-flags | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake index f49b674..c803384 100644 --- a/config/cmake/HDFCompilerFlags.cmake +++ b/config/cmake/HDFCompilerFlags.cmake @@ -200,7 +200,7 @@ if (NOT MSVC AND CMAKE_COMPILER_IS_GNUCC) # Append more extra warning flags that only gcc 7.x+ know about if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0) - set (H5_CFLAGS4 "${H5_CFLAGS4} -Walloc-zero -Walloca -Wduplicated-branches -Wformat-overflow=2 -Wformat-truncation=2 -Wimplicit-fallthrough=5 -Wrestrict") + set (H5_CFLAGS4 "${H5_CFLAGS4} -Walloc-zero -Walloca -Wduplicated-branches -Wformat-overflow=2 -Wformat-truncation=1 -Wimplicit-fallthrough=5 -Wrestrict") endif () # Append more extra warning flags that only gcc 8.x+ know about diff --git a/config/gnu-flags b/config/gnu-flags index 16795d0..a5f3258 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -276,7 +276,7 @@ if test "X-gcc" = "X-$cc_vendor"; then # gcc 7 if test $cc_vers_major -ge 7; then DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS -Wstringop-overflow=2" - H5_CFLAGS="$H5_CFLAGS -Walloc-zero -Walloca -Wduplicated-branches -Wformat-overflow=2 -Wformat-truncation=2 -Wimplicit-fallthrough=5 -Wrestrict" + H5_CFLAGS="$H5_CFLAGS -Walloc-zero -Walloca -Wduplicated-branches -Wformat-overflow=2 -Wformat-truncation=1 -Wimplicit-fallthrough=5 -Wrestrict" fi # gcc 8 |