diff options
Diffstat (limited to 'bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx index a7cf474c8947..c99e51cbd734 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include <osl/diagnose.h> #include "bridges/cpp_uno/shared/bridge.hxx" #include "bridges/cpp_uno/shared/types.hxx" @@ -44,8 +43,8 @@ inline static void callVirtualMethod( // parameter list is mixed list of * and values // reference parameters are pointers - OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" ); - OSL_ENSURE( (sizeof(void *) == 4) && + assert(pStackLongs && pAdjustedThisPtr); + static_assert( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); __asm @@ -149,7 +148,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 @@ -173,7 +172,7 @@ static void cpp_call( // stack space - OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); + static_assert(sizeof(void *) == sizeof(sal_Int32)); // args void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); // indices of values this have to be converted (interface conversion cpp<=>uno) |