bridges/source/cpp_uno/gcc3_linux_arm/share.hxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_intel/share.hxx | 2 +-
distro-configs/LibreOfficeAndroid.conf | 1 -
distro-configs/LibreOfficeAndroidX86.conf | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 63860c399b11b09c06e8df284c3d32b336d5e42c
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Thu Dec 7 00:19:34 2017 +0100
enable c++17 for android again after boost auto_ptr has a workaround
see 90d2155912bcee40377620d4836726041a72d537 for boost fix and
see effe6b3d84302afce3d5095e4f376e7e3bf669e0 for bridges fix for mac
Change-Id: Ic6209ce0927dafd39763ef0b2fabbcaa7abf743f
Reviewed-on: https://gerrit.libreoffice.org/46002
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index 62e0feece40b..3c3b46bfd6eb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
@@ -67,7 +67,7 @@ namespace __cxxabiv1 {
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_intel/share.hxx
b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
index 7b0743eec32c..307f12a8a922 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_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/distro-configs/LibreOfficeAndroid.conf
b/distro-configs/LibreOfficeAndroid.conf
index 2e6d4e6382a9..9cc574909d66 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -8,5 +8,4 @@
--without-export-validation
--without-helppack-integration
--without-junit
---disable-c++17
--disable-largefile
diff --git a/distro-configs/LibreOfficeAndroidX86.conf
b/distro-configs/LibreOfficeAndroidX86.conf
index 4e25bc58b0bd..7a2586989391 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -8,5 +8,4 @@
--without-export-validation
--without-helppack-integration
--without-junit
---disable-c++17
--disable-largefile
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
