[Libreoffice-commits] core.git: bridges/source

[Tor Lillqvist]

 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

New commits:
commit f470434b364ae223934cc4436cdc07eb03710c49
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 1 20:17:30 2014 +0300

    WaE: unused parameter 'nGPR' and 'nFPR'
    
    Change-Id: If1de390588d9f73f1dd47a622e3b183062386043

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
index 49e0191..788b98e 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
@@ -125,9 +125,7 @@ void callVirtualMethod(
     sal_uInt64 *pStack,
     int nStack,
     sal_uInt64 *pGPR,
-    int nGPR,
-    double *pFPR,
-    int nFPR)
+    double *pFPR)
 {
     // never called
     if (! pThis)
@@ -141,9 +139,6 @@ void callVirtualMethod(
         memcpy( stack, pStack, nStackBytes );
     }
 
-    assert( nGPR <= arm::MAX_GPR_REGS );
-    assert( nFPR <= arm::MAX_FPR_REGS );
-
     sal_uInt64 pMethod = *((sal_uInt64*)pThis);
     pMethod += 8 * nVtableIndex;
     pMethod = *((sal_uInt64 *)pMethod);
@@ -348,6 +343,9 @@ static void cpp_call(
         }
     }
 
+    assert( nGPR <= arm::MAX_GPR_REGS );
+    assert( nFPR <= arm::MAX_FPR_REGS );
+
     try
     {
         callVirtualMethod(
@@ -355,8 +353,8 @@ static void cpp_call(
             pCppReturn, pReturnTypeRef,
             pStackStart,
             (pStack - pStackStart),
-            pGPR, nGPR,
-            pFPR, nFPR);
+            pGPR,
+            pFPR);
 
         // NO exception occurred...
         *ppUnoExc = 0;