diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /cppu/source/AffineBridge/AffineBridge.cxx | |
| parent | tdf#43157: convert sd module away from OSL_ASSERT to assert (diff) | |
| download | core-97eb00c75e173d4c8d0b483a7941ad3d2f23783e.tar.gz core-97eb00c75e173d4c8d0b483a7941ad3d2f23783e.zip | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'cppu/source/AffineBridge/AffineBridge.cxx')
| -rw-r--r-- | cppu/source/AffineBridge/AffineBridge.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 0ae89bb71582..6d194517bf56 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -174,8 +174,8 @@ AffineBridge::~AffineBridge() void AffineBridge::outerDispatch(bool loop) { - assert(m_outerThreadId == osl::Thread::getCurrentIdentifier()); - assert(m_innerThreadId != m_outerThreadId); + OSL_ASSERT(m_outerThreadId == osl::Thread::getCurrentIdentifier()); + OSL_ASSERT(m_innerThreadId != m_outerThreadId); Msg mm; @@ -213,8 +213,8 @@ void AffineBridge::outerDispatch(bool loop) void AffineBridge::innerDispatch() { - assert(m_innerThreadId == osl::Thread::getCurrentIdentifier()); - assert(m_innerThreadId != m_outerThreadId); + OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); + OSL_ASSERT(m_innerThreadId != m_outerThreadId); Msg mm; @@ -275,7 +275,7 @@ void AffineBridge::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) void AffineBridge::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) { - assert(m_innerThreadId); + OSL_ASSERT(m_innerThreadId); osl::MutexGuard guard(m_innerMutex); @@ -310,14 +310,14 @@ void AffineBridge::v_enter() if (!m_enterCount) m_innerThreadId = osl::Thread::getCurrentIdentifier(); - assert(m_innerThreadId == osl::Thread::getCurrentIdentifier()); + OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); ++ m_enterCount; } void AffineBridge::v_leave() { - assert(m_innerThreadId == osl::Thread::getCurrentIdentifier()); + OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); -- m_enterCount; if (!m_enterCount) |