[Libreoffice-commits] core.git: bridges/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 3 20:15:25 UTC 2018
bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_mips/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_s390/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 279a1247671414413cd3a95963ab590e40dbde7d
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 3 11:20:32 2018 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 3 21:15:04 2018 +0100
sync std::unexpected_handler across bridges
Change-Id: I2c2b1159ee697acc1d22740f7a2167b30a7fec41
Reviewed-on: https://gerrit.libreoffice.org/64446
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_aix_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
index c34033a53e72..1d1a757ff857 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
@@ -46,7 +46,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
index 2e3ce61caee9..de9bd5efbccb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
@@ -47,7 +47,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
index 944b4fd18859..b66e6377c46e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
@@ -46,7 +46,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
index 5a65eeeef275..c2a64c61a11a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
@@ -46,7 +46,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
index 30111698ec6b..684223f7bf20 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
@@ -47,7 +47,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
index e97a018855d5..122a750fa86b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
@@ -46,7 +46,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
index f27a896cf5a9..f22149c03be7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
@@ -46,7 +46,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx
index b6821675c320..e93a7e8af505 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx
@@ -49,7 +49,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
index ad6ca4c946fb..b29b0df7a387 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
@@ -46,7 +46,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
index b5bc1102bf20..f71fa916ca94 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
@@ -46,7 +46,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
index aa1ecdfdc3d4..dccda8913f1c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
@@ -46,7 +46,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
index 00dc7201dc90..93c5ee2fb456 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
@@ -46,7 +46,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
index da781a3b1ef4..75678cff9f41 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
@@ -41,7 +41,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx
index b7f9980d218a..764f1a97c4f1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx
@@ -41,7 +41,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
index 2fbbe1989809..bf79a59915ca 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
@@ -45,7 +45,7 @@ struct __cxa_exception
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;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
index b7de110a2b39..60ed7a0e5b13 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
@@ -41,7 +41,7 @@ struct __cxa_exception
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;
More information about the Libreoffice-commits
mailing list