diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-13 13:12:00 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-18 11:41:52 +0200 |
commit | 0c27134fb993b30e1a0ce827364c35f8fbaac359 (patch) | |
tree | 24c7e472d5379c05e71f023278d50625d67823e9 /include | |
parent | fb1ef04ef8edac85f2d391c508e286621057fef6 (diff) |
Move yield mutex handling into SalInstance
After the refectoring in commit 4c93de2c921b ("merge
GenericSolarMutex and SolarMutex"), there is no more need to
prevent instantiation of comphelper::SolarMutex objects.
Since every VCL backend implements the yield mutex management in
the same way, we can move the general implementation into the
SalInstance.
While at it use std::unique_ptr for the yield mutex on Mac and
Windows platforms.
Change-Id: Ibe0610bd92b4623152ee14e7a35b52465d403720
Reviewed-on: https://gerrit.libreoffice.org/60570
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/solarmutex.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/comphelper/solarmutex.hxx b/include/comphelper/solarmutex.hxx index 890b3e3762dd..fdecd0d09b9c 100644 --- a/include/comphelper/solarmutex.hxx +++ b/include/comphelper/solarmutex.hxx @@ -44,6 +44,9 @@ class COMPHELPER_DLLPUBLIC SolarMutex { public: typedef void (*BeforeReleaseHandler) (); + SolarMutex(); + virtual ~SolarMutex(); + void SetBeforeReleaseHandler( const BeforeReleaseHandler& rLink ) { m_aBeforeReleaseHandler = rLink; } @@ -59,9 +62,6 @@ public: static SolarMutex *get(); protected: - SolarMutex(); - virtual ~SolarMutex(); - virtual sal_uInt32 doRelease( bool bUnlockAll ); virtual void doAcquire( sal_uInt32 nLockCount ); |