diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-08 15:52:00 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-11-11 08:42:40 +0000 |
| commit | cf63d8fc8f2006df2211c33ad077c2dcd95349e9 (patch) | |
| tree | 755d809dd8b4cec984bbfcbf213e6ffe808fb09c /src/qml/jsruntime/qv4managed_p.h | |
| parent | 8161a92b5fe1c0e4818a0fb19ed2177d7a12f731 (diff) | |
Work around -Wtautological-compare warnings on clang 3.6
Same workaround as for gcc 6.0
Change-Id: I6137b226c05ddc287bea7230d1f546c5fcf8371f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4managed_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index 1fff5a45da..28b255bd9a 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -107,13 +107,20 @@ inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {} (classname::func == QV4::Managed::func ? 0 : classname::func) // Q_VTABLE_FUNCTION triggers a bogus tautological-compare warning in GCC6+ -#if defined(Q_CC_GNU) && Q_CC_GNU >= 600 +#if (defined(Q_CC_GNU) && Q_CC_GNU >= 600) #define QT_WARNING_SUPPRESS_GCC_TAUTOLOGICAL_COMPARE_ON \ QT_WARNING_PUSH; \ QT_WARNING_DISABLE_GCC("-Wtautological-compare") #define QT_WARNING_SUPPRESS_GCC_TAUTOLOGICAL_COMPARE_OFF \ ;QT_WARNING_POP +#elif defined(Q_CC_CLANG) && Q_CC_CLANG >= 306 +#define QT_WARNING_SUPPRESS_GCC_TAUTOLOGICAL_COMPARE_ON \ + QT_WARNING_PUSH; \ + QT_WARNING_DISABLE_CLANG("-Wtautological-compare") + +#define QT_WARNING_SUPPRESS_GCC_TAUTOLOGICAL_COMPARE_OFF \ + ;QT_WARNING_POP #else #define QT_WARNING_SUPPRESS_GCC_TAUTOLOGICAL_COMPARE_ON #define QT_WARNING_SUPPRESS_GCC_TAUTOLOGICAL_COMPARE_OFF |