View | Details | Raw Unified | Return to bug 213768 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/local/poudriere/ports/local/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx (-8 / +7 lines)
Lines 1-5 Link Here
1
--- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig	2015-08-22 06:41:35 UTC
1
--- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig	2016-10-25 08:25:17.219841000 -0400
2
+++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
2
+++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx	2016-10-25 08:26:12.305617000 -0400
3
@@ -32,10 +32,34 @@
3
@@ -32,10 +32,34 @@
4
 #include <uno/any2.h>
4
 #include <uno/any2.h>
5
 #include "uno/mapping.h"
5
 #include "uno/mapping.h"
Lines 14-21 Link Here
14
+        explicit __class_type_info( const char *__n ) : type_info( __n ) { }
14
+        explicit __class_type_info( const char *__n ) : type_info( __n ) { }
15
+        virtual ~__class_type_info();
15
+        virtual ~__class_type_info();
16
+    };
16
+    };
17
 
17
+
18
-void dummy_can_throw_anything( char const * );
19
+    struct __si_class_type_info : public __class_type_info
18
+    struct __si_class_type_info : public __class_type_info
20
+    {
19
+    {
21
+        explicit __si_class_type_info( const char *__n, const __class_type_info *__b ) :
20
+        explicit __si_class_type_info( const char *__n, const __class_type_info *__b ) :
Lines 23-29 Link Here
23
+        virtual ~__si_class_type_info();
22
+        virtual ~__si_class_type_info();
24
+        const __class_type_info *__base_type;
23
+        const __class_type_info *__base_type;
25
+    };
24
+    };
26
+
25
 
26
-void dummy_can_throw_anything( char const * );
27
+extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT;
27
+extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT;
28
+
28
+
29
+extern "C" _LIBCPP_NORETURN void __cxa_throw(
29
+extern "C" _LIBCPP_NORETURN void __cxa_throw(
Lines 37-52 Link Here
37
 
37
 
38
 // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
38
 // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
39
 
39
 
40
@@ -104,6 +128,8 @@ extern "C" void __cxa_throw(
40
@@ -104,6 +128,7 @@
41
     __attribute__((noreturn));
41
     __attribute__((noreturn));
42
 }
42
 }
43
 #endif
43
 #endif
44
+}
45
+#endif
44
+#endif
46
 
45
 
47
 extern "C" void privateSnippetExecutorGeneral();
46
 extern "C" void privateSnippetExecutorGeneral();
48
 extern "C" void privateSnippetExecutorVoid();
47
 extern "C" void privateSnippetExecutorVoid();
49
@@ -115,12 +141,17 @@ extern "C" void privateSnippetExecutorCl
48
@@ -115,12 +140,17 @@
50
 namespace CPPU_CURRENT_NAMESPACE
49
 namespace CPPU_CURRENT_NAMESPACE
51
 {
50
 {
52
 
51
 

Return to bug 213768