From a32ba4b0af75e5598a85fbdb50f1c17b2073f20e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 15 Jan 2016 18:46:46 +0100 Subject: [PATCH] Boost.Config>=1.56 defines BOOST_NO_CXX11_HDR_ATOMIC --- Installation/include/CGAL/config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 99a21f5e493..3a0f293867e 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -450,7 +450,8 @@ using std::max; #define CGAL_CAN_USE_CXX11_MUTEX #endif -#if (__has_include() && __cplusplus >= 201103L ) || \ +#if ( BOOST_VERSION >= 105600 && ! defined(BOOST_NO_CXX11_HDR_ATOMIC) ) || \ + (__has_include() && __cplusplus >= 201103L ) || \ ( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \ ( _MSC_VER >= 1700 ) #define CGAL_CAN_USE_CXX11_ATOMIC