diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-21 17:30:53 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-21 17:32:26 +0100 |
| commit | 1276076ac8fcc84df64050f8aa194fa75386a0ea (patch) | |
| tree | 258d77877c052464ff113f56355bbcc5d16e80a5 /bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx | |
| parent | 329742e6c9da7cd7848d92a6846e3d1249d8d9b4 (diff) | |
ibridges: convert all legacy osl/diagnose.h assertions in source/cppu_uno
Change-Id: I4e78fac76b6bb4923e3b680d910afe5bb9640c33
Diffstat (limited to 'bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx index f5b4d0e211e3..d437817b3743 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx @@ -111,7 +111,7 @@ static void cpp_call( // Return typelib_TypeDescription * pReturnTypeDescr = 0; TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); - OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); + assert(pReturnTypeDescr); void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion (see below) @@ -317,7 +317,7 @@ void unoInterfaceProxyDispatch( #if OSL_DEBUG_LEVEL > 0 // determine vtable call index sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; - OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); + assert(nMemberPos < pTypeDescr->nAllMembers); #endif VtableSlot aVtableSlot( getVtableSlot( @@ -366,7 +366,7 @@ void unoInterfaceProxyDispatch( #if OSL_DEBUG_LEVEL > 0 // determine vtable call index sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; - OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); + assert( nMemberPos < pTypeDescr->nAllMembers); #endif VtableSlot aVtableSlot( getVtableSlot( |