merge bitcoin#26952: Avoid BOOST_NO_CXX98_FUNCTION_BASE macro redefinition

This commit is contained in:
Kittywhiskers Van Gogh 2023-01-28 17:07:52 +00:00 committed by pasta
parent 7a1f48e53c
commit da5b433909
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984

View File

@ -1471,9 +1471,11 @@ if test x$want_boost = xno; then
fi fi
dnl Prevent use of std::unary_function, which was removed in C++17, dnl Prevent use of std::unary_function, which was removed in C++17,
dnl and will generate warnings with newer compilers. dnl and will generate warnings with newer compilers for Boost
dnl See: https://github.com/boostorg/container_hash/issues/22. dnl older than 1.80.
BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_NO_CXX98_FUNCTION_BASE" dnl See: https://github.com/boostorg/config/pull/430.
AX_CHECK_PREPROC_FLAG([-DBOOST_NO_CXX98_FUNCTION_BASE], [BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_NO_CXX98_FUNCTION_BASE"], [], [$CXXFLAG_WERROR],
[AC_LANG_PROGRAM([[#include <boost/config.hpp>]])])
dnl Opt-in to Boost Process dnl Opt-in to Boost Process
if test "x$boost_process" != xno; then if test "x$boost_process" != xno; then