From 96726f4a7f2f23972c987e9a4be75539f24fb0b7 Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Sat, 9 Oct 2021 20:45:49 +0200 Subject: [PATCH] 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 --- sal/osl/all/debugbase.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 {}; - } // 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