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

[Tor Lillqvist (via logerrit)]

 bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a58e076f0cdb4d7905fccaa383d46f713fd35ef
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Nov 28 16:37:34 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Jul 25 15:23:00 2019 +0200

    Do like effe6b3d84302afce3d5095e4f376e7e3bf669e0 for iOS, too
    
    Change-Id: I9163e1722f163a04968df292ee8b29d472f9ac4f
    Reviewed-on: https://gerrit.libreoffice.org/76315
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
index ee7066931bfc..55c922f72caf 100644
--- a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
+++ b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
@@ -73,7 +73,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.