diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-01-29 00:25:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-30 10:18:44 +0000 |
| commit | b256d0bee69ca90e2598e25c636a5cbbeef02d6a (patch) | |
| tree | e19ece9ec5e5e774e7b9bc94b0710d8c04e609b4 | |
| parent | 62adce318519590ee48fc3f0bf07fd614eeffb99 (diff) | |
rhbz#1186897: bridges: oops, fix s390 bridge build
Change-Id: I5f2393b13729ab43ad2cfd4a3f960a507e3e608b
(cherry picked from commit 5d3ce204d54870f3ac7b675ec044979a598b8262)
Reviewed-on: https://gerrit.libreoffice.org/14238
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 2 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx index 49222789b73b..b0f4f7ea06c4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx @@ -360,7 +360,7 @@ static typelib_TypeClass cpp_mediate( // determine called method sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex]; - assert(nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!"); + assert(nMemberPos < pTypeDescr->nAllMembers); TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx index ed0e6cffd99c..b0733cd408ec 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx @@ -289,7 +289,7 @@ static void cpp_call( // return typelib_TypeDescription * pReturnTypeDescr = 0; TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); - assert(pReturnTypeDescr, "### expected return type description!"); + assert(pReturnTypeDescr); void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion |