diff options
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index a299fc5b2eb9..5ba5c1ff3c11 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -24,7 +24,6 @@ #include <rtl/alloc.h> #include <osl/mutex.hxx> -#include <osl/diagnose.h> #include <com/sun/star/uno/genfunc.hxx> #include "com/sun/star/uno/RuntimeException.hpp" @@ -118,7 +117,7 @@ static typelib_TypeClass cpp2uno_call( if ( !rParam.bOut && bridges::cpp_uno::shared::isSimpleType( rParam.pTypeRef ) ) // value { // Simple types must fit exactly one register on x86_64 - OSL_ASSERT( bFitsRegisters && ( ( nUsedSSE == 1 && nUsedGPR == 0 ) || ( nUsedSSE == 0 && nUsedGPR == 1 ) ) ); + assert(bFitsRegisters && ( ( nUsedSSE == 1 && nUsedGPR == 0 ) || ( nUsedSSE == 0 && nUsedGPR == 1 ) )); if ( nUsedSSE == 1 ) { @@ -292,7 +291,7 @@ typelib_TypeClass cpp_vtable_call( // determine called method sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex]; - OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!\n" ); + assert(nMemberPos < pTypeDescr->nAllMembers); TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); @@ -471,7 +470,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( typelib_TypeDescription * pTD = 0; TYPELIB_DANGER_GET( &pTD, type->ppMembers[ nPos ] ); - OSL_ASSERT( pTD ); + assert(pTD); if ( typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass ) { @@ -500,7 +499,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) ); } else - OSL_ASSERT( false ); + assert(false); TYPELIB_DANGER_RELEASE( pTD ); } |