From 65cad196df3551423cda43432b90a0b2c3b437f5 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 15 Jan 2016 17:47:45 +0100 Subject: [PATCH] Check both deprecated name and new names (Boost>=1.50) The deprecated names may be removed from future versions of Boost, and we do not want our C++11 support be dropped for users using newest versions of Boost. --- Installation/include/CGAL/config.h | 35 ++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 231e6a8ee8b..b301cfeef30 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -123,40 +123,53 @@ #if defined(BOOST_NO_CXX11_RANGE_BASED_FOR) || BOOST_VERSION < 105000 #define CGAL_NO_CPP0X_RANGE_BASED_FOR 1 #endif -#if defined(BOOST_NO_0X_HDR_ARRAY) || BOOST_VERSION < 104000 +#if defined(BOOST_NO_0X_HDR_ARRAY) || \ + defined(BOOST_NO_CXX11_HDR_ARRAY) || BOOST_VERSION < 104000 #define CGAL_CFG_NO_CPP0X_ARRAY 1 #endif -#if defined(BOOST_NO_DECLTYPE) || (BOOST_VERSION < 103600) +#if defined(BOOST_NO_DECLTYPE) || \ + defined(BOOST_NO_CXX11_DECLTYPE) || (BOOST_VERSION < 103600) #define CGAL_CFG_NO_CPP0X_DECLTYPE 1 #endif -#if defined(BOOST_NO_DELETED_FUNCTIONS) || defined(BOOST_NO_DEFAULTED_FUNCTIONS) || (BOOST_VERSION < 103600) +#if defined(BOOST_NO_DELETED_FUNCTIONS) || \ + defined(BOOST_NO_DEFAULTED_FUNCTIONS) || \ + defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) || \ + defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) || (BOOST_VERSION < 103600) #define CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS 1 #endif -#if defined(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS) || (BOOST_VERSION < 104100) +#if defined(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS) || \ + defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) || \ + (BOOST_VERSION < 104100) #define CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES 1 #endif -#if defined(BOOST_NO_INITIALIZER_LISTS) || (BOOST_VERSION < 103900) +#if defined(BOOST_NO_INITIALIZER_LISTS) || \ + defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) || (BOOST_VERSION < 103900) #define CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS 1 #endif #if defined(BOOST_MSVC) -#define CGAL_CFG_NO_CPP0X_ISFINITE 1 +#define CGAL_CFG_NO_CPP0X_ISFINITE 1 // used in #endif #if defined(BOOST_NO_LONG_LONG) || (BOOST_VERSION < 103600) #define CGAL_CFG_NO_CPP0X_LONG_LONG 1 #endif -#if defined(BOOST_NO_LAMBDAS) || BOOST_VERSION < 104000 +#if defined(BOOST_NO_LAMBDAS) || \ + defined(BOOST_NO_CXX11_LAMBDAS) || BOOST_VERSION < 104000 #define CGAL_CFG_NO_CPP0X_LAMBDAS 1 #endif -#if defined(BOOST_NO_RVALUE_REFERENCES) || (BOOST_VERSION < 103600) +#if defined(BOOST_NO_RVALUE_REFERENCES) || \ + defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || (BOOST_VERSION < 103600) #define CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE 1 #endif -#if defined(BOOST_NO_STATIC_ASSERT) || (BOOST_VERSION < 103600) +#if defined(BOOST_NO_STATIC_ASSERT) || \ + defined(BOOST_NO_CXX11_STATIC_ASSERT) || (BOOST_VERSION < 103600) #define CGAL_CFG_NO_CPP0X_STATIC_ASSERT 1 #endif -#if defined(BOOST_NO_0X_HDR_TUPLE) || (BOOST_VERSION < 104000) +#if defined(BOOST_NO_0X_HDR_TUPLE) || \ + defined(BOOST_NO_CXX11_HDR_TUPLE) || (BOOST_VERSION < 104000) #define CGAL_CFG_NO_CPP0X_TUPLE 1 #endif -#if defined(BOOST_NO_VARIADIC_TEMPLATES) || (BOOST_VERSION < 103600) +#if defined(BOOST_NO_VARIADIC_TEMPLATES) || \ + defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || (BOOST_VERSION < 103600) #define CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES 1 #endif // never use TR1