summaryrefslogtreecommitdiffstats
path: root/bridges
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-12-03 11:16:30 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-12-03 13:49:21 +0100
commitf3905c9d6df67377fa0ddcd7468e52fb5066d898 (patch)
tree7c957e8135bdcae7d704a6892dcd94f0c2e4712f /bridges
parentRevert "Check against concrete expected values in PdfExportTest::testTdf115262" (diff)
downloadcore-f3905c9d6df67377fa0ddcd7468e52fb5066d898.tar.gz
core-f3905c9d6df67377fa0ddcd7468e52fb5066d898.zip
ofz#11611 build failure with std::unexpected_handler
Change-Id: I0340ce6b89dd7edb91a4a4e0c1e21aeb307f3d9f Reviewed-on: https://gerrit.libreoffice.org/64445 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index 94ad43ae922c..864173470476 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -113,7 +113,7 @@ struct __cxa_exception {
#endif
std::type_info * exceptionType;
void (* exceptionDestructor)(void *);
- std::unexpected_handler unexpectedHandler;
+ void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17
std::terminate_handler terminateHandler;
__cxa_exception * nextException;
int handlerCount;