bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx | 2 +- bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 1f99f4a9c816cc106bfbdf229e4ec2bffb343847 Author: Heiher <r...@hev.cc> Date: Tue Jul 14 01:24:52 2015 +0800 bridges: mips64: Fix build failure in new codes. Change-Id: I17fe0fb0ce9341a638b2687e7690777a8de7fa01 Reviewed-on: https://gerrit.libreoffice.org/16980 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx index 068bc55..8f510c8 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 e7cd63f..859ffe5 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
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits