mirror of
https://github.com/boostorg/config.git
synced 2025-07-30 04:17:16 +02:00
Merge config changes from Trunk.
[SVN r83497]
This commit is contained in:
@ -219,7 +219,7 @@
|
||||
|
||||
// C++11 features supported by VC++ 11 (aka 2012) November 2012 CTP
|
||||
// Because the CTP is unsupported, unrelease, and only alpha quality,
|
||||
// it is only supported if BOOST_ENABLE_MSVC_2012_NOV_CTP is defined.
|
||||
// it is only supported if BOOST_MSVC_ENABLE_2012_NOV_CTP is defined.
|
||||
//
|
||||
#if _MSC_FULL_VER < 170051025 || !defined(BOOST_MSVC_ENABLE_2012_NOV_CTP)
|
||||
# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
|
||||
|
@ -671,7 +671,7 @@ namespace std{ using ::type_info; }
|
||||
#endif
|
||||
|
||||
// Use BOOST_NO_CXX11_HDR_ARRAY instead of BOOST_NO_0X_HDR_ARRAY
|
||||
#if defined(BOOST_NO_CXX11_HDR_ARRAY) && !defined(BOOST_NO_BOOST_NO_0X_HDR_ARRAY)
|
||||
#if defined(BOOST_NO_CXX11_HDR_ARRAY) && !defined(BOOST_NO_0X_HDR_ARRAY)
|
||||
# define BOOST_NO_0X_HDR_ARRAY
|
||||
#endif
|
||||
// Use BOOST_NO_CXX11_HDR_CHRONO instead of BOOST_NO_0X_HDR_CHRONO
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <boost/config.hpp>
|
||||
|
||||
#ifdef BOOST_NO_LIMITS
|
||||
# include <boost/detail/limits.hpp>
|
||||
# error "There is no std::numeric_limits suppport available."
|
||||
#else
|
||||
# include <limits>
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user