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/gui/image | |
| 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/gui/image')
| -rw-r--r-- | src/gui/image/qicon.cpp | 2 | ||||
| -rw-r--r-- | src/gui/image/qimage.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 0c3323636a..7d6cd50bac 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE static int nextSerialNumCounter() { - static QBasicAtomicInt serial; + static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(0); return 1 + serial.fetchAndAddRelaxed(1); } diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 75229ada6c..c1ea053204 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -91,7 +91,7 @@ static QImage rotated270(const QImage &src); static int next_qimage_serial_number() { - static QBasicAtomicInt serial; + static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(0); return 1 + serial.fetchAndAddRelaxed(1); } |