summaryrefslogtreecommitdiffstats
path: root/vcl/unx/generic/app/geninst.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/generic/app/geninst.cxx')
-rw-r--r--vcl/unx/generic/app/geninst.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx
index daf54b05879d..29b4c754da84 100644
--- a/vcl/unx/generic/app/geninst.cxx
+++ b/vcl/unx/generic/app/geninst.cxx
@@ -85,12 +85,12 @@ bool SalYieldMutex::tryToAcquire()
comphelper::SolarMutex* SalGenericInstance::GetYieldMutex()
{
- return mpSalYieldMutex;
+ return mpSalYieldMutex.get();
}
sal_uLong SalGenericInstance::ReleaseYieldMutex()
{
- SalYieldMutex* pYieldMutex = mpSalYieldMutex;
+ SalYieldMutex* pYieldMutex = mpSalYieldMutex.get();
if ( pYieldMutex->GetThreadId() ==
osl::Thread::getCurrentIdentifier() )
{
@@ -110,7 +110,7 @@ sal_uLong SalGenericInstance::ReleaseYieldMutex()
void SalGenericInstance::AcquireYieldMutex( sal_uLong nCount )
{
- SalYieldMutex* pYieldMutex = mpSalYieldMutex;
+ SalYieldMutex* pYieldMutex = mpSalYieldMutex.get();
while ( nCount )
{
pYieldMutex->acquire();
@@ -122,7 +122,7 @@ bool SalGenericInstance::CheckYieldMutex()
{
bool bRet = true;
- SalYieldMutex* pYieldMutex = mpSalYieldMutex;
+ SalYieldMutex* pYieldMutex = mpSalYieldMutex.get();
if ( pYieldMutex->GetThreadId() != osl::Thread::getCurrentIdentifier() )
{
SAL_WARN("vcl", "CheckYieldMutex: " << pYieldMutex->GetThreadId() << "!=" << osl::Thread::getCurrentIdentifier() );
@@ -134,7 +134,6 @@ bool SalGenericInstance::CheckYieldMutex()
SalGenericInstance::~SalGenericInstance()
{
- delete mpSalYieldMutex;
}
OUString SalGenericInstance::getOSVersion()