diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-24 09:30:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-29 14:16:45 +0200 |
| commit | 7e21ba684595f48e690faeb2c25cf989747b3d18 (patch) | |
| tree | c7fcd41fad1e8506750a3ed87f4e004c2b26362e | |
| parent | e8963749a7ffec3096478a4104a08bff4aaf3742 (diff) | |
SSL: remove unneeded volatile qualifications
These two variables are only ever accessed under mutex protection,
and don't otherwise look like they could be changed by the hardware,
so remove the volatile qualifier.
Change-Id: I714451bb3e80778b971a901d53fe13e1b01dd84f
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 2e99bdbca4..152cac513c 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -558,8 +558,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() bool q_resolveOpenSslSymbols() { - static volatile bool symbolsResolved = false; - static volatile bool triedToResolveSymbols = false; + static bool symbolsResolved = false; + static bool triedToResolveSymbols = false; #ifndef QT_NO_THREAD QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_SSL_library_init)); #endif |