diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 08:35:34 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 08:35:34 +1000 |
| commit | 99ef7846544ea4548fb607df37aa0429d68c2ebe (patch) | |
| tree | 4d8f5a96617cc48e06adb0f389445b4e3088b6ed /stoc/source/invocation_adapterfactory | |
| parent | f81e6f5c78686be9d58174800983012ec025b849 (diff) | |
tdf#43157: convert stoc from OSL_ASSERT to assert
Change-Id: I7d1b2748a4f4afd873ee4d65d153c76b249507dd
Diffstat (limited to 'stoc/source/invocation_adapterfactory')
| -rw-r--r-- | stoc/source/invocation_adapterfactory/iafactory.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index b7b3620a5d61..d15e2951cf7c 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -191,10 +191,10 @@ inline void AdapterImpl::release() { t_ptr_map::iterator iFind( m_pFactory->m_receiver2adapters.find( m_key ) ); - OSL_ASSERT( m_pFactory->m_receiver2adapters.end() != iFind ); + assert( m_pFactory->m_receiver2adapters.end() != iFind ); t_ptr_set & adapter_set = iFind->second; if (adapter_set.erase( this ) != 1) { - OSL_ASSERT( false ); + assert( false ); } if (adapter_set.empty()) { @@ -260,7 +260,7 @@ bool AdapterImpl::coerce_assign( if (p_exc) // exception occurred { - OSL_ASSERT( + assert( p_exc->pType->eTypeClass == typelib_TypeClass_EXCEPTION ); if (typelib_typedescriptionreference_isAssignableFrom( cppu::UnoType<RuntimeException>::get().getTypeLibType(), p_exc->pType )) @@ -648,7 +648,7 @@ AdapterImpl::AdapterImpl( pInterface->m_pTypeDescr = nullptr; pTypes[nPos].getDescription( reinterpret_cast<typelib_TypeDescription **>(&pInterface->m_pTypeDescr) ); - OSL_ASSERT( pInterface->m_pTypeDescr ); + assert( pInterface->m_pTypeDescr ); if (! pInterface->m_pTypeDescr) { for ( sal_Int32 n = 0; n < nPos; ++n ) @@ -665,7 +665,7 @@ AdapterImpl::AdapterImpl( // map receiver m_pReceiver = static_cast<uno_Interface *>(m_pFactory->m_aCpp2Uno.mapInterface( xReceiver.get(), cppu::UnoType<decltype(xReceiver)>::get() )); - OSL_ASSERT( nullptr != m_pReceiver ); + assert( nullptr != m_pReceiver ); if (! m_pReceiver) { throw RuntimeException( "cannot map receiver!" ); @@ -699,7 +699,7 @@ FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext ) UNO_QUERY_THROW ); m_pConverter = static_cast<uno_Interface *>(m_aCpp2Uno.mapInterface( xConverter.get(), cppu::UnoType<decltype(xConverter)>::get() )); - OSL_ASSERT( nullptr != m_pConverter ); + assert( nullptr != m_pConverter ); // some type info: // sequence< any > @@ -851,7 +851,7 @@ Reference< XInterface > FactoryImpl::createAdapter( m_aUno2Cpp.mapInterface( reinterpret_cast<void **>(&xRet), pUnoI, cppu::UnoType<decltype(xRet)>::get() ); that->release(); - OSL_ASSERT( xRet.is() ); + assert( xRet.is() ); if (! xRet.is()) { throw RuntimeException( "mapping UNO to C++ failed!" ); |