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/helper | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'cppu/source/helper')
| -rw-r--r-- | cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx | 4 | ||||
| -rw-r--r-- | cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx index dfafe2b181dc..8f46ce7a875a 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx @@ -146,7 +146,7 @@ void Mapping::mapInterface( uno_Interface * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr) { - assert(ppOut && pTypeDescr); + OSL_ASSERT(ppOut && pTypeDescr); if (*ppOut) { (*ppOut)->release(*ppOut); @@ -160,7 +160,7 @@ void Mapping::mapInterface( // need to enter environment because of potential "queryInterface" call rtl_uString * pOId = nullptr; uno_Environment_invoke(m_from.get(), s_getIdentifier_v, m_from.get(), &pOId, pUnoI); - assert(pOId); + OSL_ASSERT(pOId); // try to get any known interface from target environment m_to.get()->pExtEnv->getRegisteredInterface(m_to.get()->pExtEnv, reinterpret_cast<void **>(ppOut), pOId, pTypeDescr); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index ca0fffd2f4ab..0b81cea8130d 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -312,7 +312,7 @@ void Proxy::acquire() Proxy_free, m_aOId.pData, m_pTypeDescr); - assert(pThis == this); + OSL_ASSERT(pThis == this); } if (m_probeFun) |