diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-26 17:35:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-26 19:22:43 +0000 |
| commit | c1e12b15e55a82f062960f40921e0c97afda2078 (patch) | |
| tree | 4003505b015dff23632bdfd495691e6bc46377f3 /bridges | |
| parent | 3236c4926afb8598fc2d8623e539bd85694253c0 (diff) | |
Use declarations from cxxabi.h
Change-Id: Ie9bf973e87bf571e19ba036dac3a41054eaed568
Reviewed-on: https://gerrit.libreoffice.org/16520
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 5 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx index fb579a201888..ab601ddff75b 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx @@ -25,6 +25,7 @@ #include <string.h> #include <typeinfo> +#include <cxxabi.h> #include <dlfcn.h> #include "com/sun/star/uno/RuntimeException.hpp" @@ -290,7 +291,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } - pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); + pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize ); ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); // destruct uno exception @@ -321,7 +322,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) } } - __cxa_throw( pCppExc, rtti, deleteException ); + __cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException ); } void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno ) diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx index 0c7bbbfea057..5d9ca4659b26 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx @@ -133,11 +133,6 @@ extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals () throw( namespace CPPU_CURRENT_NAMESPACE { -extern "C" void *__cxa_allocate_exception( - std::size_t thrown_size ) throw(); -extern "C" void __cxa_throw ( - void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); - void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); |