diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-25 08:24:41 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-25 10:09:21 (GMT) |
| commit | 4c612a53a0fb137ac3eacbea96284eca9f5f018e (patch) | |
| tree | 036e2cb427d4463fd26c4ff6c676a2bcaf1b3f23 /src/gui | |
| parent | 9a3d28dda6ddc1b275de3e3256462870d9078e21 (diff) | |
| download | Qt-4c612a53a0fb137ac3eacbea96284eca9f5f018e.zip Qt-4c612a53a0fb137ac3eacbea96284eca9f5f018e.tar.gz Qt-4c612a53a0fb137ac3eacbea96284eca9f5f018e.tar.bz2 | |
Don't use QAtomicInt in statics because they are non-POD.
Reviewed-By: Olivier Goffart
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/egl/qegl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp index c16aeb1..776cdba 100644 --- a/src/gui/egl/qegl.cpp +++ b/src/gui/egl/qegl.cpp @@ -69,12 +69,12 @@ public: static bool displayOpened() { return displayOpen; } private: - static QAtomicInt contexts; - static QAtomicInt displayOpen; + static QBasicAtomicInt contexts; + static QBasicAtomicInt displayOpen; }; -QAtomicInt QEglContextTracker::contexts = 0; -QAtomicInt QEglContextTracker::displayOpen = 0; +QBasicAtomicInt QEglContextTracker::contexts = Q_BASIC_ATOMIC_INITIALIZER(0); +QBasicAtomicInt QEglContextTracker::displayOpen = Q_BASIC_ATOMIC_INITIALIZER(0); // Current GL and VG contexts. These are used to determine if // we can avoid an eglMakeCurrent() after a call to lazyDoneCurrent(). |