diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-02-16 15:03:01 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-02-16 19:26:46 +0000 |
| commit | cad9c7cbc9339165bb71a54c3981ccd56b6d8ef8 (patch) | |
| tree | a04365ff0f0969a8d5f43418daea01ae0e7381c0 /src/corelib/plugin | |
| parent | 99ce1d3d97c0423c3ee63ccf58deed964db0770e (diff) | |
Use static initialization for QBasicAtomics
A default-constructed static QBasicAtomicInt at function scope
will be dynamically initialized. It will still be zero-initialized,
but at least GCC adds guard variables for such objects.
When using aggregate initialization, the guard disappears.
Amends 04d6495bf773a6bb0d4fa6980df22d3b81a605b0.
Change-Id: Id9335cffdd43094cafb231fdde2523d013abe1d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/quuid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 1a7073a069..0afce7fcf0 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -968,7 +968,7 @@ QUuid QUuid::createUuid() if (!uuidseed.hasLocalData()) { int *pseed = new int; - static QBasicAtomicInt serial; + static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(0); qsrand(*pseed = QDateTime::currentSecsSinceEpoch() + quintptr(&pseed) + 2 + serial.fetchAndAddRelaxed(1)); |