1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QGlobalStatic: fix Clang warning about expression in unevaluated context

Browse Source 
From Clang 13:

qlocale.cpp:854:161: error: expression with side effects has no effect in an unevaluated context [-Werror,-Wunevaluated-expression]

Pick-to: 6.3
Change-Id: Ibf4acec0f166495998f7fffd16d6c75ef1e04262
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Thiago Macieira 2022-02-24 08:58:44 -08:00
parent e3cc3900cd
commit 77e4177d16
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/global/qglobalstatic.h
View File

@ -134,6 +134,8 @@ protected:
}; };
#define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS) \ #define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS) \
QT_WARNING_PUSH \
QT_WARNING_DISABLE_CLANG("-Wunevaluated-expression") \
namespace { struct Q_QGS_ ## NAME { \ namespace { struct Q_QGS_ ## NAME { \
typedef TYPE QGS_Type; \ typedef TYPE QGS_Type; \
static void innerFunction(void *pointer) \ static void innerFunction(void *pointer) \
@ -143,6 +145,7 @@ protected:
} \ } \
}; } \ }; } \
static QGlobalStatic<QtGlobalStatic::Holder<Q_QGS_ ## NAME>> NAME; \ static QGlobalStatic<QtGlobalStatic::Holder<Q_QGS_ ## NAME>> NAME; \
QT_WARNING_POP
/**/ /**/
#define Q_GLOBAL_STATIC(TYPE, NAME, ...) \ #define Q_GLOBAL_STATIC(TYPE, NAME, ...) \