diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-20 20:04:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-03 19:17:07 +0100 |
| commit | 527e33784ab35c57e997024f6322aebd909bcf59 (patch) | |
| tree | b89245528b3cf9711b63353c10fe160dc97ba78a /sfx2 | |
| parent | 71ea9a7219e4c7db442901bc159b2081914d2b9b (diff) | |
osl::Mutex->std::mutex in SfxApplication::GetOrCreate
Change-Id: Ieb44d6e342dda2d8aa6302f126ed0eb3fec8bf95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127901
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 42144afc33e8..5fe23fa6257f 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -56,6 +56,7 @@ #include <unotools/viewoptions.hxx> #include <rtl/strbuf.hxx> #include <memory> +#include <mutex> #include <framework/sfxhelperfunctions.hxx> #include <fwkhelper.hxx> @@ -100,10 +101,10 @@ namespace { SfxApplication* SfxApplication::GetOrCreate() { - static osl::Mutex theApplicationMutex; + static std::mutex theApplicationMutex; // SFX on demand - ::osl::MutexGuard aGuard(theApplicationMutex); + std::unique_lock aGuard(theApplicationMutex); if (!g_pSfxApplication) { SAL_INFO( "sfx.appl", "SfxApplication::SetApp" ); |