summaryrefslogtreecommitdiff
path: root/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-08-02 15:13:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-08-04 15:37:30 +0200
commit6ddecf61ecada646fbd6f8809270d47289727e8a (patch)
treed4d699b1a811e751e6bb948e441c4cdd822cb708 /bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
parent3aab478e77937f9e40f4fdfa04f7d202d7391fb8 (diff)
fillUnoException not working on std::rethrow_exception exceptions
used since... commit dacc1b40df67d154c96b256b0d920460f38c3d11 Date: Sat Jul 28 16:33:22 2018 +0100 ofz#9597 rethrown IOException not caught by catch IOException the adjustedPtr seems to be as expected, but the type_info not. Presumably these are thrown as 'dependent exceptions' (?) https://github.com/gcc-mirror/gcc/blob/master/libstdc%2B%2B-v3/libsupc%2B%2B/eh_type.cc#L42 Change-Id: Ibd736abe941bb1d5facdb88139b3a0e6cf32cf1f Reviewed-on: https://gerrit.libreoffice.org/58477 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
index dd084e340a1e..5a65eeeef275 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
@@ -72,14 +72,14 @@ struct __cxa_eh_globals
__cxa_exception *caughtExceptions;
unsigned int uncaughtExceptions;
};
-extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
+extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
+extern "C" std::type_info *__cxa_current_exception_type() throw();
void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-void fillUnoException(
- __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno);
}