diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:41:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:41:53 +0000 |
| commit | 7e5cd5b491c603c35b64d0960a3cb81a58df84e1 (patch) | |
| tree | 2fae386b2f1798a713841fa9b98ab7dc6731765f /bridges/source/cpp_uno/cc50_solaris_intel | |
| parent | 768e1c0023bd82baffd98d686a0f62cc94765a0e (diff) | |
INTEGRATION: CWS warnings01 (1.10.28); FILE MERGED
2006/05/23 23:02:51 sb 1.10.28.4: RESYNC: (1.12-1.13); FILE MERGED
2006/01/25 20:17:55 sb 1.10.28.3: RESYNC: (1.11-1.12); FILE MERGED
2005/09/22 18:11:13 sb 1.10.28.2: RESYNC: (1.10-1.11); FILE MERGED
2005/09/09 12:37:26 sb 1.10.28.1: #i53898# Made code warning-free.
Diffstat (limited to 'bridges/source/cpp_uno/cc50_solaris_intel')
| -rw-r--r-- | bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx index 526825d8b256..1711a1f44fdc 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cpp2uno.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2006-05-02 11:59:59 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:41:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -194,7 +194,9 @@ void cpp2uno_call( if (pParams[nIndex].bOut) // inout/out { // convert and assign - uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); + uno_destructData( + pCppArgs[nIndex], pParamTypeDescr, + reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() ); } @@ -320,7 +322,8 @@ extern "C" void cpp_vtable_call( { ::uno_any_construct( reinterpret_cast< uno_Any * >( pCallStack[1] ), - &pInterface, pTD, cpp_acquire ); + &pInterface, pTD, + reinterpret_cast< uno_AcquireFunc >(cpp_acquire) ); pInterface->release(); TYPELIB_DANGER_RELEASE( pTD ); *(void **)&nRegReturn = pCallStack[1]; @@ -442,8 +445,11 @@ unsigned char * codeSnippet( p += sizeof (sal_Int32); // jmp privateSnippetExecutor: *p++ = 0xE9; +#pragma disable_warn + void * e = reinterpret_cast< void * >(exec); +#pragma enable_warn *reinterpret_cast< sal_Int32 * >(p) - = ((unsigned char *) exec) - p - sizeof (sal_Int32); + = static_cast< unsigned char * >(e) - p - sizeof (sal_Int32); p += sizeof (sal_Int32); OSL_ASSERT(p - code <= codeSnippetSize); return code + codeSnippetSize; @@ -473,7 +479,7 @@ void ** bridges::cpp_uno::shared::VtableFactory::initializeBlock(void * block) { unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( void ** slots, unsigned char * code, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, - sal_Int32 functionCount, sal_Int32 vtableOffset) + sal_Int32, sal_Int32 vtableOffset) { for (sal_Int32 i = 0; i < type->nMembers; ++i) { typelib_TypeDescription * member = 0; |