mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable c++17 for android again after boost auto_ptr has a workaround

Browse Source 
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+LibreOffice@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Christian Lohmaier 2017-12-07 00:19:34 +01:00
parent 3486d08421
commit 63860c399b
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
View File

@ -67,7 +67,7 @@ namespace __cxxabiv1 {
std::type_info *exceptionType; std::type_info *exceptionType;
void (*exceptionDestructor)(void *); void (*exceptionDestructor)(void *);
std::unexpected_handler unexpectedHandler; void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17
std::terminate_handler terminateHandler; std::terminate_handler terminateHandler;
__cxa_exception *nextException; __cxa_exception *nextException;

2
bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
View File

@ -45,7 +45,7 @@ struct __cxa_exception
std::type_info *exceptionType; std::type_info *exceptionType;
void (*exceptionDestructor)(void *); void (*exceptionDestructor)(void *);
std::unexpected_handler unexpectedHandler; void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17
std::terminate_handler terminateHandler; std::terminate_handler terminateHandler;
__cxa_exception *nextException; __cxa_exception *nextException;

1
distro-configs/LibreOfficeAndroid.conf
View File

@ -8,5 +8,4 @@
--without-export-validation --without-export-validation
--without-helppack-integration --without-helppack-integration
--without-junit --without-junit
--disable-c++17
--disable-largefile --disable-largefile

1
distro-configs/LibreOfficeAndroidX86.conf
View File

@ -8,5 +8,4 @@
--without-export-validation --without-export-validation
--without-helppack-integration --without-helppack-integration
--without-junit --without-junit
--disable-c++17
--disable-largefile --disable-largefile