mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use declarations from cxxabi.h

Browse Source 
Change-Id: Ie9bf973e87bf571e19ba036dac3a41054eaed568
Reviewed-on: https://gerrit.libreoffice.org/16520
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2015-06-26 17:35:41 +02:00
parent 3236c4926a
commit c1e12b15e5
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
View File

@ -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 )

5
bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
View File

@ -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 );