diff options
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index efdf211d8a6e..11426e9475b2 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -20,6 +20,7 @@ #include <stdio.h> #include <stdlib.h> +#include <typeinfo> #include <rtl/alloc.h> #include <sal/log.hxx> @@ -453,7 +454,7 @@ static unsigned char * codeSnippet( unsigned char * code, return code + codeSnippetSize; } -struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; }; +struct bridges::cpp_uno::shared::VtableFactory::Slot { void const * fn; }; bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) @@ -467,6 +468,12 @@ std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize( return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize; } +namespace { +// Some dummy type whose RTTI is used in the synthesized proxy vtables to make uses of dynamic_cast +// on such proxy objects not crash: +struct ProxyRtti {}; +} + bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::VtableFactory::initializeBlock( void * block, sal_Int32 slotCount, sal_Int32, @@ -474,7 +481,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( { Slot * slots = mapBlockToVtable(block); slots[-2].fn = nullptr; - slots[-1].fn = nullptr; + slots[-1].fn = &typeid(ProxyRtti); return slots + slotCount; } |