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

Related: rhbz#1125588 ppc64le fix simple struct returning

Browse Source 
Change-Id: I1e253922fdb606648eff9865f1125a24e35b0d9a
This commit is contained in:
Caolán McNamara
2014-08-22 13:52:53 +01:00
parent 9a6d1c6e16
commit ee6fcdd18b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
View File

@@ -305,14 +305,18 @@ static void cpp_call(
void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
bool bOverflow = false; bool bOverflow = false;
bool bSimpleReturn = true;
if (pReturnTypeDescr) if (pReturnTypeDescr)
{ {
#if OSL_DEBUG_LEVEL > 2 #if OSL_DEBUG_LEVEL > 2
fprintf(stderr, "return type is %d\n", pReturnTypeDescr->eTypeClass); fprintf(stderr, "return type is %d\n", pReturnTypeDescr->eTypeClass);
#endif #endif
if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr )) if (ppc64::return_in_hidden_param(pReturnTypeRef))
bSimpleReturn = false;
if (bSimpleReturn)
{ {
pCppReturn = pUnoReturn; // direct way for simple types pCppReturn = pUnoReturn; // direct way for simple types
#if OSL_DEBUG_LEVEL > 2 #if OSL_DEBUG_LEVEL > 2