You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2023/03/13 00:50:52 UTC
[openoffice] branch AOO42X updated: Boost should not use c++11 features when in c++98 mode
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 1136cb7a62 Boost should not use c++11 features when in c++98 mode
1136cb7a62 is described below
commit 1136cb7a624182cd7fb001ac1dfaa1ca5720576a
Author: Don Lewis <dl...@catspoiler.org>
AuthorDate: Sun Mar 12 17:42:25 2023 -0700
Boost should not use c++11 features when in c++98 mode
The version of boost that we bundle sometimes tries to use c++11 features
when compiling in pre-c++11 modes. Recent versions of clang flag this
as an error.
(cherry picked from commit 2b2585ab0ed5461cca8e077940dd449c4669a17a)
---
main/boost/boost_1_55_0.patch | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/main/boost/boost_1_55_0.patch b/main/boost/boost_1_55_0.patch
index b2042a01c7..937c4704b4 100644
--- a/main/boost/boost_1_55_0.patch
+++ b/main/boost/boost_1_55_0.patch
@@ -359,6 +359,18 @@ diff -ur misc/boost_1_55_0/boost/config/compiler/gcc.hpp misc/build/boost_1_55_0
# define BOOST_HAS_VARIADIC_TMPL
# else
# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+diff -ur misc/boost_1_55_0/boost/config/stdlib/libcpp.hpp misc/build/boost_1_55_0/boost/config/stdlib/libcpp.hpp
+--- misc/boost_1_55_0/boost/config/stdlib/libcpp.hpp 2012-05-15 04:57:21.000000000 -0700
++++ misc/build/boost_1_55_0/boost/config/stdlib/libcpp.hpp
+@@ -19,7 +19,7 @@
+
+ #define BOOST_HAS_THREADS
+
+-#ifdef _LIBCPP_HAS_NO_VARIADICS
++#if defined(_LIBCPP_HAS_NO_VARIADICS) || (__cplusplus < 201103)
+ # define BOOST_NO_CXX11_HDR_TUPLE
+ #endif
+
--- misc/boost_1_55_0/boost/tr1/detail/config_all.hpp 2020-11-21 14:07:48.895886290 +0100
+++ misc/build/boost_1_55_0/boost/tr1/detail/config_all.hpp 2020-11-21 14:10:16.895419939 +0100
@@ -95,6 +95,11 @@