diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-30 08:35:29 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-30 08:37:15 +0300 |
| commit | 313a47faacd469a94dac456161e1c09ff496cfd9 (patch) | |
| tree | 68f30acca7b812a55b08554e2585b10eb989acf5 /bridges | |
| parent | 2f6ff1df4da6da4c101392dba5d6438904927374 (diff) | |
iOS simulator fix and some cosmetics
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx index 8b9e130b66e8..12e9d971c655 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx @@ -77,7 +77,7 @@ void cpp2uno_call( #else CPPU_CURRENT_NAMESPACE::isSimpleReturnType( pReturnTypeDescr ) #endif - ) + ) { pUnoReturn = pReturnValue; // direct way for simple types } @@ -365,7 +365,6 @@ extern "C" void cpp_vtable_call( } //================================================================================================== - extern "C" { extern int nFunIndexes, nVtableOffsets; #ifdef __arm @@ -446,7 +445,6 @@ unsigned char * codeSnippet( return codeSnippets[functionIndex*nVtableOffsets*6*2 + vtableOffset*6*2 + exec*2 + flag]; #endif - } } @@ -462,7 +460,11 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize( sal_Int32 slotCount) { - return 0; +#ifdef __arm + ??? +#else + return (slotCount + 2) * sizeof (Slot); +#endif } bridges::cpp_uno::shared::VtableFactory::Slot * @@ -487,7 +489,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( TYPELIB_DANGER_GET(&member, type->ppMembers[i]); OSL_ASSERT(member != 0); switch (member->eTypeClass) { - case typelib_TypeClass_INTERFACE_ATTRIBUTE: { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: #ifdef __arm typelib_InterfaceAttributeTypeDescription *pAttrTD = reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( member ); @@ -516,10 +518,9 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( #endif ); } - } break; - case typelib_TypeClass_INTERFACE_METHOD: { + case typelib_TypeClass_INTERFACE_METHOD: #ifdef __arm typelib_InterfaceMethodTypeDescription *pMethodTD = reinterpret_cast< @@ -534,7 +535,6 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( member)->pReturnTypeRef #endif ); - } break; default: |