diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-07-07 11:49:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-07-07 12:01:01 +0200 |
| commit | aa04177e7c43d75bc87875a9d8ce2393d7263822 (patch) | |
| tree | 5e7e95d4dd4be25def0bd31f2253c4b3d9242716 /bridges | |
| parent | 25b02fffbb6f68d0d60a1a421b9ae17dac00482d (diff) | |
Drop unused nGPR parameter
Change-Id: I60026ccc9c752389260a6b4e6255c53981eea4ba
Diffstat (limited to 'bridges')
3 files changed, 5 insertions, 7 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx index 084d5e5a511d..dba9bfed45f2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx @@ -48,14 +48,12 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod( void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn, typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn, - sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, sal_uInt32 nGPR, - double * pFPR, sal_uInt32 nFPR) + sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, double * pFPR, + sal_uInt32 nFPR) { // Should not happen, but... if ( nFPR > x86_64::MAX_SSE_REGS ) nFPR = x86_64::MAX_SSE_REGS; - if ( nGPR > x86_64::MAX_GPR_REGS ) - nGPR = x86_64::MAX_GPR_REGS; // Work around Clang -fsanitize=address "inline assembly requires more // registers than available" error: diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx index cfea6ab40c41..162f9af4d782 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx @@ -31,8 +31,8 @@ namespace CPPU_CURRENT_NAMESPACE { void callVirtualMethod( void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn, typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn, - sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, sal_uInt32 nGPR, - double * pFPR, sal_uInt32 nFPR); + sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, double * pFPR, + sal_uInt32 nFPR); } diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index f4c70a1a6e92..dea6fef5e44e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -232,7 +232,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeRef, bSimpleReturn, pStackStart, ( pStack - pStackStart ), - pGPR, nGPR, + pGPR, pFPR, nFPR ); } catch (const Exception &) { throw; |