Skip to content

Commit 0416ea9

Browse files
committed
Merge #10239: Make Boost use std::atomic internally
394ccf7 Make Boost use std::atomic internally (Pieter Wuille) Tree-SHA512: 2be198caea1b255d29ab841ca9f6ee4f32ec875cb9657553ed6ea6d21a4cd1390f1e3b22b23a3a4a24d9efc0bda100c7fbfd4dc480e0cc9831b565e989a2b636
2 parents 694062e + 394ccf7 commit 0416ea9

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,10 @@ AX_BOOST_PROGRAM_OPTIONS
676676
AX_BOOST_THREAD
677677
AX_BOOST_CHRONO
678678

679+
dnl Boost 1.56 through 1.62 allow using std::atomic instead of its own atomic
680+
dnl counter implementations. In 1.63 and later the std::atomic approach is default.
681+
m4_pattern_allow(DBOOST_AC_USE_STD_ATOMIC) dnl otherwise it's treated like a macro
682+
BOOST_CPPFLAGS="-DBOOST_SP_USE_STD_ATOMIC -DBOOST_AC_USE_STD_ATOMIC $BOOST_CPPFLAGS"
679683

680684
if test x$use_reduce_exports = xyes; then
681685
AC_MSG_CHECKING([for working boost reduced exports])

0 commit comments

Comments
 (0)