summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-06-28 10:36:37 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-06-28 11:55:24 +0200
commitead76a20700410c16f450e9dde61f5c1f0a4c5b6 (patch)
tree986f5adab99e56c903fd597761b133970b07cfa4
parenttdf#149654 sw content controls: fix missing string before inline SDT from DOCX (diff)
downloadcore-ead76a20700410c16f450e9dde61f5c1f0a4c5b6.tar.gz
core-ead76a20700410c16f450e9dde61f5c1f0a4c5b6.zip
The std::unary_function workaround should no longer be necessary
...with the bundled Boost 1.79.0, as workdir/UnpackedTarball/boost/boost/numeric/conversion/detail/converter.hpp no longer uses it since <https://github.com/boostorg/numeric_conversion/commit/ebfded1d7d4a2f773e8233c4df6f96131f79d72e> "Remove the deprecated uses of std::unary_function (again)" in Boost 1.66.0 Change-Id: I58808cc2a7836c63ee13cf63c8528fc95f4e2cea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136555 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--external/boost/StaticLibrary_boost_date_time.mk7
1 files changed, 0 insertions, 7 deletions
diff --git a/external/boost/StaticLibrary_boost_date_time.mk b/external/boost/StaticLibrary_boost_date_time.mk
index 2045243590e5..9e92272fa2f8 100644
--- a/external/boost/StaticLibrary_boost_date_time.mk
+++ b/external/boost/StaticLibrary_boost_date_time.mk
@@ -18,13 +18,6 @@ $(eval $(call gb_StaticLibrary_add_defs,boost_date_time,\
-DBOOST_ALL_NO_LIB \
))
-# Needed when building against MSVC in C++17 mode, as
-# workdir/UnpackedTarball/boost/boost/numeric/conversion/detail/converter.hpp uses
-# std::unary_function:
-$(eval $(call gb_StaticLibrary_add_defs,boost_date_time, \
- -D_HAS_AUTO_PTR_ETC=1 \
-))
-
$(eval $(call gb_StaticLibrary_use_external,boost_date_time,boost_headers))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_date_time,cpp))