Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/numeric/ublas/detail/config.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
author | Chris Cannam |
---|---|
date | Mon, 07 Sep 2015 11:12:49 +0100 |
parents | 2665513ce2d3 |
children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/numeric/ublas/detail/config.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/numeric/ublas/detail/config.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -28,15 +28,24 @@ #include <boost/type_traits/is_const.hpp> #include <boost/type_traits/remove_reference.hpp> +// C++11 +#if defined(__cplusplus) && __cplusplus >= 201103L + +#define BOOST_UBLAS_CPP_GE_2011 + +#elif BOOST_MSVC >= 1800 + +#define BOOST_UBLAS_CPP_GE_2011 + +#else + +#undef BOOST_UBLAS_CPP_GE_2011 // Make sure no one defined it + +#endif // Microsoft Visual C++ #if defined (BOOST_MSVC) && ! defined (BOOST_STRICT_CONFIG) -// Version 6.0 and 7.0 -#if BOOST_MSVC <= 1300 -#define BOOST_UBLAS_UNSUPPORTED_COMPILER 1 -#endif - // Version 7.1 #if BOOST_MSVC == 1310 // One of these workarounds is needed for MSVC 7.1 AFAIK @@ -164,7 +173,7 @@ // Detect other compilers with serious defects - override by defineing BOOST_UBLAS_UNSUPPORTED_COMPILER=0 #ifndef BOOST_UBLAS_UNSUPPORTED_COMPILER -#if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) || defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_SFINAE) || defined(BOOST_NO_STDC_NAMESPACE) +#if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) || defined(BOOST_NO_SFINAE) || defined(BOOST_NO_STDC_NAMESPACE) #define BOOST_UBLAS_UNSUPPORTED_COMPILER 1 #endif #endif @@ -292,3 +301,4 @@ #endif +