[Libreoffice-commits] core.git: bridges/source

[Libreoffice Gerrit user]

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

New commits:
commit f3905c9d6df67377fa0ddcd7468e52fb5066d898
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 3 11:16:30 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 3 13:49:21 2018 +0100

    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>

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;