diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-23 18:43:37 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-23 18:45:26 +0200 |
| commit | d2464dfee928cdd4194516e9bc8b541c22972ab9 (patch) | |
| tree | 19021d0c8d5bf2cd672b4e127e93e489606e98e7 /src/util.cpp | |
| parent | d946e9a848b82873881cd48267041081be8424c5 (diff) | |
| parent | a794284e61988a226ea39327449be9906a1b5abd (diff) | |
| download | bitcoin-d2464dfee928cdd4194516e9bc8b541c22972ab9.tar.xz | |
Merge pull request #6287
a794284 locking: add a quick example of GUARDED_BY (Cory Fields)
2b890dd locking: fix a few small issues uncovered by -Wthread-safety (Cory Fields)
cd27bba locking: teach Clang's -Wthread-safety to cope with our scoped lock macros (Cory Fields)
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.cpp b/src/util.cpp index 97fecc6c8e..37d52037c0 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -114,7 +114,7 @@ CTranslationInterface translationInterface; /** Init OpenSSL library multithreading support */ static CCriticalSection** ppmutexOpenSSL; -void locking_callback(int mode, int i, const char* file, int line) +void locking_callback(int mode, int i, const char* file, int line) NO_THREAD_SAFETY_ANALYSIS { if (mode & CRYPTO_LOCK) { ENTER_CRITICAL_SECTION(*ppmutexOpenSSL[i]); |