Skip to content

Commit

Permalink
merge bitcoin#26952: Avoid BOOST_NO_CXX98_FUNCTION_BASE macro redef…
Browse files Browse the repository at this point in the history
…inition
  • Loading branch information
kwvg authored and PastaPastaPasta committed Aug 13, 2024
1 parent 7a1f48e commit da5b433
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1471,9 +1471,11 @@ if test x$want_boost = xno; then
fi

dnl Prevent use of std::unary_function, which was removed in C++17,
dnl and will generate warnings with newer compilers.
dnl See: https://github.com/boostorg/container_hash/issues/22.
BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_NO_CXX98_FUNCTION_BASE"
dnl and will generate warnings with newer compilers for Boost
dnl older than 1.80.
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
if test "x$boost_process" != xno; then
Expand Down

0 comments on commit da5b433

Please sign in to comment.