diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-01-28 13:51:23 -0800 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-01-29 04:26:09 +0000 |
| commit | c05ee60a2ffff2c357e9840b0851d9f7d10e656f (patch) | |
| tree | 6d69bc12f1cb4663c4868b96684c0d2ee8259e02 | |
| parent | 82147ce33a31e491c8363b78b50fbb9b1a2619de (diff) | |
QEvent: initialize the static userEventTypeRegistry constexprly
The {} is the difference.
Pick-to: 5.15 6.2 6.3
Change-Id: I6fcda969a9e9427198bffffd16ce8dabd213393e
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
| -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 { |