Differential D2108 Diff 4443 head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx
Changeset View
Changeset View
Standalone View
Standalone View
head/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx
| --- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig 2014-09-19 10:51:13.000000000 -0700 | --- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig 2014-09-19 17:51:13 UTC | ||||
| +++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 2015-03-13 09:48:24.000000000 -0700 | +++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx | ||||
| @@ -446,7 +446,11 @@ | @@ -24,9 +24,10 @@ | ||||
| // MARKER(update_precomp.py): autogen include statement, do not remove | |||||
| #include "precompiled_bridges.hxx" | |||||
| -#include <exception> | |||||
| #include <typeinfo> | |||||
| -#include <stdio.h> | |||||
| +#include <exception> | |||||
| +#include <cstddef> | |||||
| +#include <cxxabi.h> | |||||
| #include <stdlib.h> | |||||
| #include <string.h> | |||||
| @@ -47,6 +48,11 @@ | |||||
| using namespace ::rtl; | |||||
| using namespace ::com::sun::star::uno; | |||||
| +#ifdef __GLIBCXX__ | |||||
| +using CPPU_CURRENT_NAMESPACE::__cxa_get_globals; | |||||
| +#else | |||||
| +using __cxxabiv1::__cxa_get_globals; | |||||
| +#endif | |||||
| //================================================================================================== | |||||
| static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, | |||||
| @@ -446,7 +452,7 @@ static void cpp_call( | |||||
| catch (...) | catch (...) | ||||
| { | { | ||||
| // fill uno exception | // fill uno exception | ||||
| +#ifndef __GLIBCXX__ | - fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); | ||||
| + CPPU_CURRENT_NAMESPACE::fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); | + CPPU_CURRENT_NAMESPACE::fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); | ||||
| +#else /* __GLIBCXX__ */ | |||||
| fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); | |||||
| +#endif /* __GLIBCXX__ */ | |||||
| // temporary params | // temporary params | ||||
| for ( ; nTempIndizes--; ) | for ( ; nTempIndizes--; ) | ||||