diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-07-22 22:18:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 11:33:37 +0200 |
| commit | 0de7513cd73f1f35265e42f9a2b9befe81302c2c (patch) | |
| tree | 2aaba5295e7e7222c85bdbec3fb724302396b2b3 /include/svtools | |
| parent | 4e512171c21a193027c35d19a5273507a2725596 (diff) | |
osl::Mutex->std::mutex in AsynchronLink
and inline the mutex since the only two users of this class both
want the mutex
Change-Id: I7821d67ad77e08059ef2fe6ccc6cc06570e8070b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119393
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/asynclink.hxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx index 468f2a722548..bc0c742a4b4e 100644 --- a/include/svtools/asynclink.hxx +++ b/include/svtools/asynclink.hxx @@ -23,8 +23,7 @@ #include <svtools/svtdllapi.h> #include <tools/link.hxx> #include <vcl/idle.hxx> -#include <osl/mutex.hxx> -#include <memory> +#include <mutex> class Timer; struct ImplSVEvent; @@ -38,7 +37,7 @@ class UNLESS_MERGELIBS(SVT_DLLPUBLIC) AsynchronLink bool _bInCall; bool* _pDeleted; void* _pArg; - std::unique_ptr<::osl::Mutex> _pMutex; + std::mutex _aMutex; DECL_DLLPRIVATE_LINK( HandleCall_Idle, Timer*, void ); DECL_DLLPRIVATE_LINK( HandleCall_PostUserEvent, void*, void ); @@ -60,7 +59,6 @@ public: {} ~AsynchronLink(); - void CreateMutex(); void operator=( const Link<void*,void>& rLink ) { _aLink = rLink; } void Call( void* pObj, bool bAllowDoubles = false ); void ClearPendingCall( ); |