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

[Stephan Bergmann]

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

New commits:
commit effe6b3d84302afce3d5095e4f376e7e3bf669e0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 5 10:20:50 2017 +0100

    std::unexpected_handler is gone at least from recent libc++ in C++17 mode
    
    Change-Id: Ibae0499f52c1e22ec9790e62cc84053dff2c2add
    Reviewed-on: https://gerrit.libreoffice.org/45855
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
index 6cc59bf2e0ed..3eb88cdc0242 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
@@ -80,7 +80,7 @@ struct __cxa_exception
 
   // The C++ standard has entertaining rules wrt calling set_terminate
   // and set_unexpected in the middle of the exception cleanup process.
-  std::unexpected_handler unexpectedHandler;
+  void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17
   std::terminate_handler terminateHandler;
 
   // The caught exception stack threads through here.