diff options
| author | David Faure <david.faure@kdab.com> | 2018-09-07 13:22:13 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-09-07 13:15:49 +0000 |
| commit | b3ccb3998b3d6000a9f3f31a37a16db151b4d265 (patch) | |
| tree | 99505022ecb943234c2fb7cbdc3a92bdb7c7cf5a /src/3rdparty | |
| parent | 4b72555d0a325a94c73697e8a1a5b56472f83565 (diff) | |
Fix compile error with gcc7 in developer mode by defining FALLTHROUGH
qtdeclarative/src/3rdparty/masm/yarr/YarrParser.h:355:24: error: this statement may fall through [-Werror=implicit-fallthrough=]
FALLTHROUGH;
Change-Id: I08321d30d54e192bcd3957a3fc7bf634220e9914
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/wtf/StdLibExtras.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/masm/wtf/StdLibExtras.h b/src/3rdparty/masm/wtf/StdLibExtras.h index 18d15542ac..421712c349 100644 --- a/src/3rdparty/masm/wtf/StdLibExtras.h +++ b/src/3rdparty/masm/wtf/StdLibExtras.h @@ -30,6 +30,7 @@ #include <wtf/CheckedArithmetic.h> #include <wtf/Platform.h> #include <memory> +#include <qglobal.h> // Use these to declare and define a static local variable (static T;) so that // it is leaked so that its destructors are not called at exit. Using this @@ -73,7 +74,7 @@ #define STRINGIZE(exp) #exp #define STRINGIZE_VALUE_OF(exp) STRINGIZE(exp) -#define FALLTHROUGH +#define FALLTHROUGH Q_FALLTHROUGH() /* * The reinterpret_cast<Type1*>([pointer to Type2]) expressions - where |