From 7e21ba684595f48e690faeb2c25cf989747b3d18 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 24 Aug 2012 09:30:23 +0200 Subject: [PATCH] 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 Reviewed-by: Thiago Macieira --- src/network/ssl/qsslsocket_openssl_symbols.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 2e99bdb..152cac5 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -558,8 +558,8 @@ static QPair 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 -- 2.7.4