diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-02-24 08:58:44 -0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-10 08:23:47 +0000 |
| commit | c2b8b9e4508c5867f2201e5311b9ee7073d2e77f (patch) | |
| tree | d4c6d14a3c28805d5289a52739d8e2e3564bbb52 | |
| parent | 1e8efaee35ee5d0429f321fe94e275c89c2af0b2 (diff) | |
QGlobalStatic: fix Clang warning about expression in unevaluated context
From Clang 13:
qlocale.cpp:854:161: error: expression with side effects has no effect in an unevaluated context [-Werror,-Wunevaluated-expression]
Change-Id: Ibf4acec0f166495998f7fffd16d6c75ef1e04262
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 77e4177d1634ed8e1d7eed32bdd8e9967ae6e2fe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/global/qglobalstatic.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qglobalstatic.h b/src/corelib/global/qglobalstatic.h index 1e35cb29f0..aaa01262a7 100644 --- a/src/corelib/global/qglobalstatic.h +++ b/src/corelib/global/qglobalstatic.h @@ -134,6 +134,8 @@ protected: }; #define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS) \ + QT_WARNING_PUSH \ + QT_WARNING_DISABLE_CLANG("-Wunevaluated-expression") \ namespace { struct Q_QGS_ ## NAME { \ typedef TYPE QGS_Type; \ static void innerFunction(void *pointer) \ @@ -143,6 +145,7 @@ protected: } \ }; } \ static QGlobalStatic<QtGlobalStatic::Holder<Q_QGS_ ## NAME>> NAME; \ + QT_WARNING_POP /**/ #define Q_GLOBAL_STATIC(TYPE, NAME, ...) \ |