From 652f5225fbf44e7be8062bb31e3bfd8a70f2344c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 29 Dec 2017 08:21:33 +0300 Subject: Remove clang attributes from sdlgfxblitfunc.cpp And disable fallthrough warnings in clang 6.0 because it broken. --- src/resources/sdlgfxblitfunc.cpp | 4 ---- tools/ci/jobs/clang60.sh | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/resources/sdlgfxblitfunc.cpp b/src/resources/sdlgfxblitfunc.cpp index 09843f568..d5e3268c7 100644 --- a/src/resources/sdlgfxblitfunc.cpp +++ b/src/resources/sdlgfxblitfunc.cpp @@ -45,13 +45,9 @@ PRAGMA48(GCC diagnostic pop) { \ case 0: do { \ pixel_copy_increment; \ - CLANG_FALLTHROUGH \ case 3: pixel_copy_increment; \ - CLANG_FALLTHROUGH \ case 2: pixel_copy_increment; \ - CLANG_FALLTHROUGH \ case 1: pixel_copy_increment; \ - CLANG_FALLTHROUGH \ default: ; \ } while (--n > 0 ); \ } diff --git a/tools/ci/jobs/clang60.sh b/tools/ci/jobs/clang60.sh index 64cd0637a..db12c82c5 100755 --- a/tools/ci/jobs/clang60.sh +++ b/tools/ci/jobs/clang60.sh @@ -24,6 +24,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \ -Wno-variadic-macros -Wno-double-promotion -Wno-attributes -Wno-shadow-field \ -Wpointer-bool-conversion -fno-omit-frame-pointer -Wno-c++98-compat-pedantic \ +-Wno-implicit-fallthrough \ -ggdb3 $POST_CXXFLAGS" do_init -- cgit v1.2.3-70-g09d2