diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-01-28 13:51:23 -0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-29 06:12:30 +0000 |
| commit | 7125a2a5a6950d57faad7318a7dc7e2a0a3f194f (patch) | |
| tree | 68e57ae8a29cd1511e83578b3a0ffbc4dabb8fa1 /src | |
| parent | e1d51d944066c2f48f76460caa20c7bc6f51e08d (diff) | |
QEvent: initialize the static userEventTypeRegistry constexprly
The {} is the difference.
Change-Id: I6fcda969a9e9427198bffffd16ce8dabd213393e
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit c05ee60a2ffff2c357e9840b0851d9f7d10e656f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index 85b5d2457e..cc804a55c7 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -456,6 +456,8 @@ struct QBasicAtomicBitField { QBasicAtomicInteger<uint> next; QBasicAtomicInteger<uint> data[NumInts]; + constexpr QBasicAtomicBitField() = default; + bool allocateSpecific(int which) noexcept { QBasicAtomicInteger<uint> &entry = data[which / BitsPerInt]; @@ -496,7 +498,7 @@ struct QBasicAtomicBitField { typedef QBasicAtomicBitField<QEvent::MaxUser - QEvent::User + 1> UserEventTypeRegistry; -static UserEventTypeRegistry userEventTypeRegistry; +static UserEventTypeRegistry userEventTypeRegistry {}; static inline int registerEventTypeZeroBased(int id) noexcept { |