diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 10:07:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 10:07:45 +0000 |
| commit | 72c1a7fbd9d9b483968495bad548246fff19ee0a (patch) | |
| tree | dd201f38d9ffd6aeb989a6451bc54784f35a7a7f /bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx | |
| parent | cc7e3003030dacf6b6bc006543dc4abe277a364b (diff) | |
INTEGRATION: CWS jw2 (1.9.18); FILE MERGED
2006/11/15 08:40:37 sparcmoz 1.9.18.2: #71180#: warnings are errors - allow debug build
2006/11/09 03:13:42 sparcmoz 1.9.18.1: #i71180#: remove warnings for gcc 4.1.2
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index 80e451b7cbb7..5b1523c50207 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: uno2cpp.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-16 15:49:57 $ + * last change: $Author: vg $ $Date: 2006-11-22 11:07:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,11 +69,16 @@ void callVirtualMethod( void * pAdjustedThisPtr, sal_Int32 nStackLongs ) __attribute__((noinline)); void callVirtualMethod( void * pAdjustedThisPtr, - sal_Int32 nVtableIndex, + sal_Int32 /* nVtableIndex */, void * pRegisterReturn, typelib_TypeClass eReturnType, +#if OSL_DEBUG_LEVEL > 0 sal_Int32 * pStackLongs, - sal_Int32 nStackLongs ) + sal_Int32 nStackLongs) +#else + sal_Int32 * /*pStackLongs*/, + sal_Int32 /*nStackLongs*/) +#endif { // parameter list is mixed list of * and values // reference parameters are pointers @@ -279,6 +284,8 @@ void callVirtualMethod( void * pAdjustedThisPtr, case typelib_TypeClass_DOUBLE: *(double*)pRegisterReturn = f0d; break; + default: + break; } } @@ -487,7 +494,7 @@ void unoInterfaceProxyDispatch( // is my surrogate bridges::cpp_uno::shared::UnoInterfaceProxy * pThis = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI); - typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; +// typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; switch (pMemberDescr->eTypeClass) { |