|
 |
2e0f4e8 |
From 10a269784fd425c2bef2c91f7c7a5ddd1a6d105b Mon Sep 17 00:00:00 2001
|
|
|
2e0f4e8 |
From: David Tardon <dtardon@redhat.com>
|
|
|
2e0f4e8 |
Date: Thu, 28 Aug 2014 16:10:11 +0200
|
|
|
2e0f4e8 |
Subject: [PATCH] cast arg to the right type
|
|
|
2e0f4e8 |
|
|
|
2e0f4e8 |
According to desc., typelib_TypeDescription can be safely used where
|
|
|
2e0f4e8 |
typelib_TypeDescriptionReference is expected.
|
|
|
2e0f4e8 |
|
|
|
2e0f4e8 |
Change-Id: Ibc3effd7e2894ba6ff738503e747f5157c146454
|
|
|
2e0f4e8 |
---
|
|
|
2e0f4e8 |
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 2 +-
|
|
|
2e0f4e8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
2e0f4e8 |
|
|
|
2e0f4e8 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
|
|
|
2e0f4e8 |
index 5836d8b..b41cee6 100644
|
|
|
2e0f4e8 |
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
|
|
|
2e0f4e8 |
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
|
|
|
2e0f4e8 |
@@ -233,7 +233,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
|
|
|
2e0f4e8 |
"fmr %0, 1\n\t"
|
|
|
2e0f4e8 |
: "=f" (dret), "=r" (r3), "=r" (r4) : );
|
|
|
2e0f4e8 |
|
|
|
2e0f4e8 |
- MapReturn(r3, r4, dret, pReturnTypeDescr, pRegisterReturn);
|
|
|
2e0f4e8 |
+ MapReturn(r3, r4, dret, reinterpret_cast<typelib_TypeDescriptionReference *>(pReturnTypeDescr), pRegisterReturn);
|
|
|
2e0f4e8 |
}
|
|
|
2e0f4e8 |
|
|
|
2e0f4e8 |
// Macros for easier insertion of values to registers or stack
|
|
|
2e0f4e8 |
--
|
|
|
2e0f4e8 |
1.9.3
|
|
|
2e0f4e8 |
|