[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - bridges/source

[Caolán McNamara (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ca9108626442451e88bc9504476a21528524a083
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 3 11:16:30 2018 +0000
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Wed Jun 10 17:52:51 2020 +0200

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95599
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

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;