diff options
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_intel/except.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index 8e9ed1e0d868..b06bd4b28f35 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -156,6 +156,9 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) #if OSL_DEBUG_LEVEL > 1 fprintf( stderr,"generated rtti for %s\n", rttiName ); #endif +// TODO: incompatible with llvm-c++ in ndk16 - no __si_class_type_info or __class_type_info +// either do as iOS one and inline thing or find another way +#if !defined(ANDROID) if (pTypeDescr->pBaseTypeDescription) { // ensure availability of base @@ -173,6 +176,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) pair< t_rtti_map::iterator, bool > insertion( m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); SAL_WARN_IF( !insertion.second, "bridges", "### inserting new generated rtti failed?!" ); +#endif } else // taking already generated rtti { @@ -247,7 +251,9 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) } rtti = s_rtti->getRTTI(reinterpret_cast<typelib_CompoundTypeDescription *>(pTypeDescr)); TYPELIB_DANGER_RELEASE( pTypeDescr ); +#if !defined(ANDROID) // see TODO above assert(rtti && "### no rtti for throwing exception!"); +#endif if (! rtti) { throw RuntimeException( |