1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
--- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig 2016-10-28 14:50:26 UTC
+++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
@@ -33,10 +33,34 @@
#include <uno/any2.h>
#include "uno/mapping.h"
-namespace CPPU_CURRENT_NAMESPACE
+#ifdef _LIBCPP_VERSION
+
+namespace __cxxabiv1
{
+ struct __class_type_info : public std::type_info
+ {
+ explicit __class_type_info( const char *__n ) : type_info( __n ) { }
+ virtual ~__class_type_info();
+ };
-void dummy_can_throw_anything( char const * );
+ struct __si_class_type_info : public __class_type_info
+ {
+ explicit __si_class_type_info( const char *__n, const __class_type_info *__b ) :
+ __class_type_info( __n ), __base_type( __b ) { }
+ virtual ~__si_class_type_info();
+ const __class_type_info *__base_type;
+ };
+
+extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT;
+
+extern "C" _LIBCPP_NORETURN void __cxa_throw(
+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) );
+}
+
+#else
+
+namespace CPPU_CURRENT_NAMESPACE
+{
// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h
@@ -98,6 +122,8 @@ extern "C" void __cxa_throw(
}
#endif
+#endif
+
extern "C" void privateSnippetExecutorGeneral();
extern "C" void privateSnippetExecutorVoid();
extern "C" void privateSnippetExecutorHyper();
@@ -108,12 +134,17 @@ extern "C" void privateSnippetExecutorCl
namespace CPPU_CURRENT_NAMESPACE
{
+void dummy_can_throw_anything( char const * );
+
void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
void fillUnoException(
+#ifdef _LIBCPP_VERSION
+ __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+#else
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-
+#endif
}
namespace x86
|
