[Libreoffice-commits] core.git: scripting/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sun Aug 1 19:01:39 UTC 2021
scripting/source/provider/MasterScriptProvider.cxx | 2 +-
scripting/source/provider/MasterScriptProvider.hxx | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 86d66c60043f97fcdeb7cabd40fe86c03216655a
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Aug 1 12:56:22 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 1 21:01:03 2021 +0200
osl::Mutex->std::mutex in MasterScriptProvider
Change-Id: I40c2add3863ba284e6436a81424e3bbc7d501116
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119819
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 041f77a65c40..e8719c8cb4aa 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -335,7 +335,7 @@ MasterScriptProvider::providerCache()
{
if ( !m_pPCache )
{
- ::osl::MutexGuard aGuard( m_mutex );
+ std::lock_guard aGuard( m_mutex );
if ( !m_pPCache )
{
Sequence<OUString> denylist { "com.sun.star.script.provider.ScriptProviderForBasic" };
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 2328746f950a..0e6c40f5f0a6 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -35,6 +35,7 @@
#include "ProviderCache.hxx"
#include <memory>
+#include <mutex>
namespace func_provider
{
@@ -121,7 +122,7 @@ private:
bool m_bIsPkgMSP;
css::uno::Reference< css::script::provider::XScriptProvider > m_xMSPPkg;
std::unique_ptr<ProviderCache> m_pPCache;
- osl::Mutex m_mutex;
+ std::mutex m_mutex;
OUString m_sCtxString;
};
More information about the Libreoffice-commits
mailing list