bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 10c742afd5f04c2c3a3e1f881fd6a8c61d364c03 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Sat Aug 21 21:05:48 2021 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Sat Aug 21 22:08:18 2021 +0200 arm: fix bridge which went a little wrong in commit dd91d3389c26645459d3b80649941d65efa4f63f Date: Sat Jan 2 14:36:44 2021 +0100 Fix some warnings for Raspberry pi 4 (part3) Change-Id: Ief7e1146b7480a1c16ec0810f991296710214332 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120830 Tested-by: Caolán McNamara <caol...@redhat.com> Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 7a8adad90ead..a22ac393b5f7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -298,9 +298,9 @@ void callVirtualMethod( #define INSERT_INT32( pSV, nr, pGPR, pDS ) \ if ( nr < arm::MAX_GPR_REGS ) \ - pGPR[nr++] = reinterpret_cast<sal_uInt32>( pSV ); \ + pGPR[nr++] = *reinterpret_cast<const sal_uInt32*>( pSV ); \ else \ - *pDS++ = reinterpret_cast<sal_uInt32>( pSV ); + *pDS++ = *reinterpret_cast<const sal_uInt32*>( pSV ); #ifdef __ARM_EABI__ #define INSERT_INT64( pSV, nr, pGPR, pDS, pStart ) \ @@ -310,8 +310,8 @@ void callVirtualMethod( } \ if ( nr < arm::MAX_GPR_REGS ) \ { \ - *reinterpret_cast<sal_uInt32 *>(pGPR[nr++]) = *static_cast<sal_uInt32 *>( pSV ); \ - *reinterpret_cast<sal_uInt32 *>(pGPR[nr++]) = *(static_cast<sal_uInt32 *>( pSV ) + 1); \ + pGPR[nr++] = *static_cast<const sal_uInt32 *>( pSV ); \ + pGPR[nr++] = *(static_cast<const sal_uInt32 *>( pSV ) + 1); \ } \ else \ { \ @@ -319,8 +319,8 @@ void callVirtualMethod( { \ ++pDS; \ } \ - *reinterpret_cast<sal_uInt32 *>(*pDS++) = static_cast<sal_uInt32 *>( pSV )[0]; \ - *reinterpret_cast<sal_uInt32 *>(*pDS++) = static_cast<sal_uInt32 *>( pSV )[1]; \ + *pDS++ = static_cast<sal_uInt32 *>( pSV )[0]; \ + *pDS++ = static_cast<sal_uInt32 *>( pSV )[1]; \ } #else #define INSERT_INT64( pSV, nr, pGPR, pDS, pStart ) \