sal/osl/all/debugbase.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 96726f4a7f2f23972c987e9a4be75539f24fb0b7
Author: Arnaud Versini <arnaud.vers...@libreoffice.org>
AuthorDate: Sat Oct 9 20:45:49 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Oct 10 19:46:36 2021 +0200
OSL : remove useless rtl::Static in debugbase
Change-Id: I54ef4d1b492409265496c7f2b852568274bcf073
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123321
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 209dc55e1e32..208fa3e92a92 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -56,8 +56,6 @@ bool isSubStr( char const* pStr, OString const& subStr )
return rtl_str_indexOfStr( pStr, subStr.getStr() ) >= 0;
}
-struct DebugBaseMutex : rtl::Static<osl::Mutex, DebugBaseMutex> {};
-
} // anon namespace
extern "C" {
@@ -72,7 +70,8 @@ extern "C" {
osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex()
SAL_THROW_EXTERN_C()
{
- return DebugBaseMutex::get();
+ static osl::Mutex aMutex;
+ return aMutex;
}
#ifdef __clang__
#pragma clang diagnostic pop
