summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 07:56:18 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 07:56:18 +1000
commit2a385968c6c70a0c3158feabe991eda8c428f234 (patch)
tree218ab03d764512b852a1f773a1d7d4452a8864e2 /cppu
parent1f4c85d0f56bb633bb31d4a0cbaf30c19b9fbbcd (diff)
tdf#43157: convert cppu's AffineBridge from OSL_ASSERT to assert
Change-Id: Ia55de2424b6e42a4377e7f5c06387aec79a59ec4
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/AffineBridge/AffineBridge.cxx14
1 files changed, 7 insertions, 7 deletions
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)