| author |  Noam Preil <noam@pixelhero.dev> 2020-05-17 04:31:19-04:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2020-05-17 12:18:53-04:00 |
| log | 03ed9e4173131ac5e6157be500e3c50f7e0b0947 |
| tree | 91102c6977041e13929a13f9bd5d687c984e1794 |
| parent | 241984987b394ea73ff17fa60846b1e0e85e3433 |
Fix compilation with GCC 5
2 files changed, 5 insertions(+), 2 deletions(-)
CMakeLists.txt+4-1
| ... | ... | @@ -329,7 +329,10 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") |
| 329 | 329 | if(MSVC) |
| 330 | 330 | set(EXE_CFLAGS "${EXE_CFLAGS} /w") |
| 331 | 331 | else() |
| 332 | set(EXE_CFLAGS "${EXE_CFLAGS} -Werror -Wall -Werror=implicit-fallthrough") | |
| 332 | set(EXE_CFLAGS "${EXE_CFLAGS} -Werror -Wall") | |
| 333 | if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0) | |
| 334 | set(EXE_CFLAGS "${EXE_CFLAGS} -Werror=implicit-fallthrough") | |
| 335 | endif() | |
| 333 | 336 | endif() |
| 334 | 337 | endif() |
| 335 | 338 |
src/util_base.hpp+1-1
| ... | ... | @@ -68,7 +68,7 @@ static inline void zig_assert(bool ok, const char *file, int line, const char *f |
| 68 | 68 | #define ZIG_FALLTHROUGH |
| 69 | 69 | #elif defined(__clang__) |
| 70 | 70 | #define ZIG_FALLTHROUGH [[clang::fallthrough]] |
| 71 | #elif defined(__GNUC__) | |
| 71 | #elif defined(__GNUC__) && __GNUC__ >= 7 | |
| 72 | 72 | #define ZIG_FALLTHROUGH __attribute__((fallthrough)) |
| 73 | 73 | #else |
| 74 | 74 | #define ZIG_FALLTHROUGH |