aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <[email protected]>2017-04-20 06:41:29 -0700
committerPieter Wuille <[email protected]>2017-04-20 08:10:26 -0700
commit394ccf76adb016b48908cd9a0fa08a1663a7ddba (patch)
tree96b097afacd16e9673d48e292ccee8a0f2058f1f
parentMerge #10231: [Qt] Reduce a significant cs_main lock freeze (diff)
downloaddiscoin-394ccf76adb016b48908cd9a0fa08a1663a7ddba.tar.xz
discoin-394ccf76adb016b48908cd9a0fa08a1663a7ddba.zip
Make Boost use std::atomic internally
-rw-r--r--configure.ac4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 1e1ed49f9..496a6bcf9 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])