diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2023-03-23 11:11:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-23 19:49:25 +0000 |
| commit | e7dbef922a2fc73469f12c520bcc1af54fe038fb (patch) | |
| tree | 02c18e1d1c9d0d85914626f66ace24a79f892e79 /svl | |
| parent | 462ebbd10bd537f42104fe991a0aeebcd563f178 (diff) | |
rtl::Static to thread-safe-static
Change-Id: Ife02e6d2be3ebfbb08522ab0183ef4aa31a99e19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149415
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/config/ctloptions.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 38544f758a3a..288761bd9394 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -338,13 +338,17 @@ namespace { // global std::weak_ptr<SvtCTLOptions_Impl> g_pCTLOptions; - struct CTLMutex : public rtl::Static< osl::Mutex, CTLMutex > {}; + osl::Mutex& CTLMutex() + { + static osl::Mutex aMutex; + return aMutex; + } } SvtCTLOptions::SvtCTLOptions( bool bDontLoad ) { // Global access, must be guarded (multithreading) - ::osl::MutexGuard aGuard( CTLMutex::get() ); + ::osl::MutexGuard aGuard( CTLMutex() ); m_pImpl = g_pCTLOptions.lock(); if ( !m_pImpl ) @@ -364,7 +368,7 @@ SvtCTLOptions::SvtCTLOptions( bool bDontLoad ) SvtCTLOptions::~SvtCTLOptions() { // Global access, must be guarded (multithreading) - ::osl::MutexGuard aGuard( CTLMutex::get() ); + ::osl::MutexGuard aGuard( CTLMutex() ); m_pImpl->RemoveListener(this); m_pImpl.reset(); |