diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 21:06:47 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 21:06:47 +0200 |
| commit | 42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4 (patch) | |
| tree | a7f25b1d335a834a7c3ae104cee913ef3a4dd4fb /src/corelib/kernel/qcoreevent.cpp | |
| parent | 4ee4fc18b4067b90efa46ca9baba74f53b54d9ec (diff) | |
| parent | 168ff3419f256fdb35b586275d293fc0cd773fe1 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: Iaff6b55275e50d19973e1020853d8622587069f9
Diffstat (limited to 'src/corelib/kernel/qcoreevent.cpp')
| -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 e3326f00d7..b497532008 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -421,6 +421,8 @@ struct QBasicAtomicBitField { QBasicAtomicInteger<uint> next; QBasicAtomicInteger<uint> data[NumInts]; + constexpr QBasicAtomicBitField() = default; + bool allocateSpecific(int which) noexcept { QBasicAtomicInteger<uint> &entry = data[which / BitsPerInt]; @@ -461,7 +463,7 @@ struct QBasicAtomicBitField { typedef QBasicAtomicBitField<QEvent::MaxUser - QEvent::User + 1> UserEventTypeRegistry; -static UserEventTypeRegistry userEventTypeRegistry; +static UserEventTypeRegistry userEventTypeRegistry {}; static inline int registerEventTypeZeroBased(int id) noexcept { |