diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-04-21 10:56:44 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-04-21 10:56:53 +0200 |
| commit | 0416ea9f743fcbf40f6caabed13df56a18a4ab41 (patch) | |
| tree | e20b3edf5ba9cfcd2d4d614da3b37494d33f8159 | |
| parent | 694062eafec5fe1526e4c72a1804d91d1ccd6a2c (diff) | |
| parent | 394ccf76adb016b48908cd9a0fa08a1663a7ddba (diff) | |
| download | bitcoin-0416ea9f743fcbf40f6caabed13df56a18a4ab41.tar.xz | |
Merge #10239: Make Boost use std::atomic internally
394ccf7 Make Boost use std::atomic internally (Pieter Wuille)
Tree-SHA512: 2be198caea1b255d29ab841ca9f6ee4f32ec875cb9657553ed6ea6d21a4cd1390f1e3b22b23a3a4a24d9efc0bda100c7fbfd4dc480e0cc9831b565e989a2b636
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1e1ed49f91..496a6bcf9f 100644 --- a/configure.ac +++ b/configure.ac @@ -676,6 +676,10 @@ AX_BOOST_PROGRAM_OPTIONS AX_BOOST_THREAD AX_BOOST_CHRONO +dnl Boost 1.56 through 1.62 allow using std::atomic instead of its own atomic +dnl counter implementations. In 1.63 and later the std::atomic approach is default. +m4_pattern_allow(DBOOST_AC_USE_STD_ATOMIC) dnl otherwise it's treated like a macro +BOOST_CPPFLAGS="-DBOOST_SP_USE_STD_ATOMIC -DBOOST_AC_USE_STD_ATOMIC $BOOST_CPPFLAGS" if test x$use_reduce_exports = xyes; then AC_MSG_CHECKING([for working boost reduced exports]) |