summaryrefslogtreecommitdiff
path: root/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-11-21 17:30:53 +0100
committerMichael Stahl <mstahl@redhat.com>2014-11-21 17:32:26 +0100
commit1276076ac8fcc84df64050f8aa194fa75386a0ea (patch)
tree258d77877c052464ff113f56355bbcc5d16e80a5 /bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
parent329742e6c9da7cd7848d92a6846e3d1249d8d9b4 (diff)
ibridges: convert all legacy osl/diagnose.h assertions in source/cppu_uno
Change-Id: I4e78fac76b6bb4923e3b680d910afe5bb9640c33
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
index f805f2850d24..45429d0e3b09 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
@@ -214,7 +214,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
@@ -239,7 +239,7 @@ static void cpp_call(
INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack );
// stack space
- OSL_ENSURE( sizeof(void *) == sizeof(sal_Int64), "### unexpected size!" );
+ static_assert(sizeof(void *) == sizeof(sal_Int64), "### unexpected size!");
// args
void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
// indices of values this have to be converted (interface conversion cpp<=>uno)