summaryrefslogtreecommitdiff
path: root/vcl/osx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-10-09 11:27:26 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-10-09 14:51:44 +0000
commitf76b3dd039818cc2b297fa2a11b60d9e055e6d8c (patch)
treee46d4174cd7f66edeb962031e59259b820eaa344 /vcl/osx
parent3e23ee076ae6b46af617c0692998b22459a43dde (diff)
Move SolarMutex down from tools to comphelper/ to make life easier.
Change-Id: I7dd21f30daa27e5de2848eb16aee9a610dd629d5 Reviewed-on: https://gerrit.libreoffice.org/19271 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/osx')
-rw-r--r--vcl/osx/salinst.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index bc9b2050777d..137c72f17da9 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -21,7 +21,7 @@
#include <stdio.h>
-#include <tools/solarmutex.hxx>
+#include <comphelper/solarmutex.hxx>
#include "comphelper/lok.hxx"
@@ -350,7 +350,7 @@ AquaSalInstance::AquaSalInstance()
{
mpSalYieldMutex = new SalYieldMutex;
mpSalYieldMutex->acquire();
- ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex );
+ ::comphelper::SolarMutex::setSolarMutex( mpSalYieldMutex );
maMainThread = osl::Thread::getCurrentIdentifier();
mbWaitingYield = false;
maUserEventListMutex = osl_createMutex();
@@ -360,7 +360,7 @@ AquaSalInstance::AquaSalInstance()
AquaSalInstance::~AquaSalInstance()
{
- ::tools::SolarMutex::SetSolarMutex( 0 );
+ ::comphelper::SolarMutex::setSolarMutex( 0 );
mpSalYieldMutex->release();
delete mpSalYieldMutex;
osl_destroyMutex( maUserEventListMutex );