diff options
| author | Heiher <r@hev.cc> | 2015-07-14 01:24:52 +0800 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-13 09:49:14 +0000 |
| commit | 1f99f4a9c816cc106bfbdf229e4ec2bffb343847 (patch) | |
| tree | 95561ec9222dfd6289936998b89ad29a67230f35 /bridges | |
| parent | 755b9320c81948358a1d4104c8875594b5700d39 (diff) | |
bridges: mips64: Fix build failure in new codes.
Change-Id: I17fe0fb0ce9341a638b2687e7690777a8de7fa01
Reviewed-on: https://gerrit.libreoffice.org/16980
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx | 2 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx index 068bc55d9fe9..8f510c82ecc6 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx @@ -544,7 +544,7 @@ namespace unsigned char * codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, - bool bHasHiddenParam) SAL_THROW(()) + bool bHasHiddenParam ) { #ifdef BRDEBUG fprintf(stderr,"in codeSnippet functionIndex is %d\n", functionIndex); diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx index e7cd63fc6fd1..859ffe5b3142 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx @@ -141,7 +141,7 @@ namespace sal_uInt32 nREG) { // Should not happen, but... - static_assert( MAX_GP_REGS == MAX_FP_REGS ); + static_assert(MAX_GP_REGS == MAX_FP_REGS, "must be the same size"); if ( nREG > MAX_GP_REGS ) nREG = MAX_GP_REGS; @@ -266,7 +266,7 @@ namespace // 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 |