diff options
author | Malte Timmermann <Malte.Timmermann@sun.com> | 2010-07-01 09:13:15 +0200 |
---|---|---|
committer | Malte Timmermann <Malte.Timmermann@sun.com> | 2010-07-01 09:13:15 +0200 |
commit | 839a386cb51ba43988142957c091140885a5d3f7 (patch) | |
tree | b25d54f440bb26780d27afa45ab31fa9c98e0af7 /vcl/unx/headless | |
parent | 2b871bd0fc25abc760bd71577ee5e59df6d1b18e (diff) |
codecleanup02: #i52551# Removed old stuff: VOS_NAMESPACE, use vos:: directly
Diffstat (limited to 'vcl/unx/headless')
-rw-r--r-- | vcl/unx/headless/svpinst.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/headless/svpinst.hxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx index 466b56868900..5c3be54f9ddc 100644 --- a/vcl/unx/headless/svpinst.cxx +++ b/vcl/unx/headless/svpinst.cxx @@ -302,7 +302,7 @@ vos::IMutex* SvpSalInstance::GetYieldMutex() ULONG SvpSalInstance::ReleaseYieldMutex() { if ( m_aYieldMutex.GetThreadId() == - NAMESPACE_VOS(OThread)::getCurrentIdentifier() ) + vos::OThread::getCurrentIdentifier() ) { ULONG nCount = m_aYieldMutex.GetAcquireCount(); ULONG n = nCount; @@ -464,13 +464,13 @@ SvpSalYieldMutex::SvpSalYieldMutex() void SvpSalYieldMutex::acquire() { OMutex::acquire(); - mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier(); + mnThreadId = vos::OThread::getCurrentIdentifier(); mnCount++; } void SvpSalYieldMutex::release() { - if ( mnThreadId == NAMESPACE_VOS(OThread)::getCurrentIdentifier() ) + if ( mnThreadId == vos::OThread::getCurrentIdentifier() ) { if ( mnCount == 1 ) mnThreadId = 0; @@ -483,7 +483,7 @@ sal_Bool SvpSalYieldMutex::tryToAcquire() { if ( OMutex::tryToAcquire() ) { - mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier(); + mnThreadId = vos::OThread::getCurrentIdentifier(); mnCount++; return sal_True; } diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx index 284a2d11cd82..d931a2735ff9 100644 --- a/vcl/unx/headless/svpinst.hxx +++ b/vcl/unx/headless/svpinst.hxx @@ -46,11 +46,11 @@ // SalYieldMutex // ------------------------------------------------------------------------- -class SvpSalYieldMutex : public NAMESPACE_VOS(OMutex) +class SvpSalYieldMutex : public vos::OMutex { protected: ULONG mnCount; - NAMESPACE_VOS(OThread)::TThreadIdentifier mnThreadId; + vos::OThread::TThreadIdentifier mnThreadId; public: SvpSalYieldMutex(); @@ -60,7 +60,7 @@ public: virtual sal_Bool tryToAcquire(); ULONG GetAcquireCount() const { return mnCount; } - NAMESPACE_VOS(OThread)::TThreadIdentifier GetThreadId() const { return mnThreadId; } + vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; } }; // --------------- |