summaryrefslogtreecommitdiff
path: root/vcl/generic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-05-14 13:15:38 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-05-14 14:41:54 +0200
commit11fd73acce5d8bff7025bb6ddcbaf99d9d70b545 (patch)
tree1a3d4dbe24e4bbbf301eca3a277e211483b3312a /vcl/generic
parenta883783c2a1b0e7a8ee5b46387d1e1e3bc5e19bd (diff)
SolarMutex does not belong into the URE interface
...so move it from osl/mutex.hxx to its own comphelper/solarmutex.hxx. It looks like a newbie mistake that 59e7685d8d812ee8773f57475cbe3aa2a0bdfc81 "Create an abstract interface to be used to implement a SolarMutex" put it here in the first place. I do not consider this an incompatible change really, as no external URE client code should have used SolarMutex anyway. (Also included some clean up, like removing unused {Clearable,Resettable}SolarGuard, and spelling out SolarGuard in the few places it is used.) Change-Id: I121ffb5b7cefbc19e88b5405e5a85ffc895be852
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/app/geninst.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index b5d309d4f280..22a3975ab3a6 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -63,19 +63,19 @@ void SalYieldMutex::release()
SolarMutexObject::release();
}
-sal_Bool SalYieldMutex::tryToAcquire()
+bool SalYieldMutex::tryToAcquire()
{
if ( SolarMutexObject::tryToAcquire() )
{
mnThreadId = osl::Thread::getCurrentIdentifier();
mnCount++;
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
-osl::SolarMutex* SalGenericInstance::GetYieldMutex()
+comphelper::SolarMutex* SalGenericInstance::GetYieldMutex()
{
return mpSalYieldMutex;
}