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 14:30:27 +0000 |
commit | f05d2764b0c5a1b55c7856984017254b55bfc7e3 (patch) | |
tree | 998d9000147ecfa6d284a8973f87eda5b76136c9 /src/corelib/kernel/qjnihelpers.cpp | |
parent | bee82432ebf37312ef28846722fbf925ef4f04c8 (diff) |
QJNIHelpers: unbreak runnables counter
Adding 0 each time will obviously not produce a new identifier each
time...
Also use static initialization for QBasicAtomicInt.
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 265db5ad9bda9c984393c1e95fd27dcc4633ed1c.
Change-Id: Ia71290cf26c486dcbcc74381f12cd0c4712d6019
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/corelib/kernel/qjnihelpers.cpp')
-rw-r--r-- | src/corelib/kernel/qjnihelpers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index 310d3e24b2..fe204bbee2 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -79,8 +79,8 @@ Q_GLOBAL_STATIC(PendingPermissionRequestsHash, g_pendingPermissionRequests); static QBasicMutex g_pendingPermissionRequestsMutex; static int nextRequestCode() { - static QBasicAtomicInt counter; - return counter.fetchAndAddRelaxed(0); + static QBasicAtomicInt counter = Q_BASIC_ATOMIC_INITIALIZER(0); + return counter.fetchAndAddRelaxed(1); } // function called from Java from Android UI thread |