diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 12:41:57 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 12:41:57 +0000 |
| commit | 0b536d2d8b1bef971f5db4f13b1a4adf98f6340d (patch) | |
| tree | 33707f2ebb3beca249aeba928a6854f8fc9d360d | |
| parent | e99cfa02a6ff4f9cc56abfeab40990ae2bb36897 (diff) | |
INTEGRATION: CWS ooo20031216 (1.2.62); FILE MERGED
2003/12/27 09:50:06 waratah 1.2.62.1: #i23885# correct for permissive, needs override of volatile
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx index 2239826c37dc..965c3ff95172 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cpp2uno.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2003-04-28 16:28:42 $ + * last change: $Author: hr $ $Date: 2004-02-04 13:41:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -488,7 +488,7 @@ static void cpp_vtable_call() sal_Bool bComplex = nTableEntry & 0x80000000 ? sal_True : sal_False; typelib_TypeClass aType = - cpp_mediate( nTableEntry, pCallStack+17, &nRegReturn ); + cpp_mediate( nTableEntry, pCallStack+17, (sal_Int64*)&nRegReturn ); switch( aType ) { |