mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bridges: mips64: Fix build failure in new codes.

Browse Source 
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>
This commit is contained in:
Heiher
2015-07-14 01:24:52 +08:00
committed by Caolán McNamara
parent 755b9320c8
commit 1f99f4a9c8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
View File

@@ -544,7 +544,7 @@ namespace
unsigned char * codeSnippet( unsigned char * code, unsigned char * codeSnippet( unsigned char * code,
sal_Int32 functionIndex, sal_Int32 vtableOffset, sal_Int32 functionIndex, sal_Int32 vtableOffset,
bool bHasHiddenParam) SAL_THROW(()) bool bHasHiddenParam )
{ {
#ifdef BRDEBUG #ifdef BRDEBUG
fprintf(stderr,"in codeSnippet functionIndex is %d\n", functionIndex); fprintf(stderr,"in codeSnippet functionIndex is %d\n", functionIndex);

4
bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx
View File

@@ -141,7 +141,7 @@ namespace
sal_uInt32 nREG) sal_uInt32 nREG)
{ {
// Should not happen, but... // 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 ) if ( nREG > MAX_GP_REGS )
nREG = MAX_GP_REGS; nREG = MAX_GP_REGS;
@@ -266,7 +266,7 @@ namespace
// return // return
typelib_TypeDescription * pReturnTypeDescr = 0; typelib_TypeDescription * pReturnTypeDescr = 0;
TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
assert( pReturnTypeDescr, "### expected return type description!" ); assert(pReturnTypeDescr);
void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion