[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - bridges/source

[David Tardon]

 bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b189dd7e075af80f3d4ba366a46561562854ba7
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 28 16:10:11 2014 +0200

    cast arg to the right type
    
    According to desc., typelib_TypeDescription can be safely used where
    typelib_TypeDescriptionReference is expected.
    
    Change-Id: Ibc3effd7e2894ba6ff738503e747f5157c146454
    (cherry picked from commit ef8b94ab0e689851871f9783d4b1f3724177cf3a)
    Reviewed-on: https://gerrit.libreoffice.org/11177
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index c958de5..20e8b5a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -233,7 +233,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
                 "fmr    %0,     1\n\t"
                 : "=f" (dret), "=r" (r3), "=r" (r4) : );
 
-    MapReturn(r3, r4, dret, pReturnTypeDescr, pRegisterReturn);
+    MapReturn(r3, r4, dret, reinterpret_cast<typelib_TypeDescriptionReference *>(pReturnTypeDescr), pRegisterReturn);
 }
 
 // Macros for easier insertion of values to registers or stack