From 2a385968c6c70a0c3158feabe991eda8c428f234 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 7 May 2017 07:56:18 +1000 Subject: tdf#43157: convert cppu's AffineBridge from OSL_ASSERT to assert Change-Id: Ia55de2424b6e42a4377e7f5c06387aec79a59ec4 --- cppu/source/AffineBridge/AffineBridge.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'cppu') diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 6d194517bf56..0ae89bb71582 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -174,8 +174,8 @@ AffineBridge::~AffineBridge() void AffineBridge::outerDispatch(bool loop) { - OSL_ASSERT(m_outerThreadId == osl::Thread::getCurrentIdentifier()); - OSL_ASSERT(m_innerThreadId != m_outerThreadId); + assert(m_outerThreadId == osl::Thread::getCurrentIdentifier()); + assert(m_innerThreadId != m_outerThreadId); Msg mm; @@ -213,8 +213,8 @@ void AffineBridge::outerDispatch(bool loop) void AffineBridge::innerDispatch() { - OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); - OSL_ASSERT(m_innerThreadId != m_outerThreadId); + assert(m_innerThreadId == osl::Thread::getCurrentIdentifier()); + 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) { - OSL_ASSERT(m_innerThreadId); + assert(m_innerThreadId); osl::MutexGuard guard(m_innerMutex); @@ -310,14 +310,14 @@ void AffineBridge::v_enter() if (!m_enterCount) m_innerThreadId = osl::Thread::getCurrentIdentifier(); - OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); + assert(m_innerThreadId == osl::Thread::getCurrentIdentifier()); ++ m_enterCount; } void AffineBridge::v_leave() { - OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); + assert(m_innerThreadId == osl::Thread::getCurrentIdentifier()); -- m_enterCount; if (!m_enterCount) -- cgit v1.2.3