Subject: [Boost-commit] svn:boost r83497 - in branches/release: boost boost/config boost/config/compiler boost/detail libs/config
From: john_at_[hidden]
Date: 2013-03-19 14:36:03
Author: johnmaddock
Date: 2013-03-19 14:36:02 EDT (Tue, 19 Mar 2013)
New Revision: 83497
URL: http://svn.boost.org/trac/boost/changeset/83497
Log:
Merge config changes from Trunk.
Properties modified:
branches/release/boost/config/ (props changed)
branches/release/boost/config.hpp (props changed)
branches/release/boost/current_function.hpp (props changed)
branches/release/boost/detail/endian.hpp (props changed)
branches/release/boost/limits.hpp (contents, props changed)
branches/release/libs/config/ (props changed)
Text files modified:
branches/release/boost/config/compiler/visualc.hpp | 2 +-
branches/release/boost/config/suffix.hpp | 2 +-
branches/release/boost/limits.hpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Modified: branches/release/boost/config/compiler/visualc.hpp
==============================================================================
--- branches/release/boost/config/compiler/visualc.hpp (original)
+++ branches/release/boost/config/compiler/visualc.hpp 2013-03-19 14:36:02 EDT (Tue, 19 Mar 2013)
@@ -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
Modified: branches/release/boost/config/suffix.hpp
==============================================================================
--- branches/release/boost/config/suffix.hpp (original)
+++ branches/release/boost/config/suffix.hpp 2013-03-19 14:36:02 EDT (Tue, 19 Mar 2013)
@@ -671,7 +671,7 @@
#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
Modified: branches/release/boost/limits.hpp
==============================================================================
--- branches/release/boost/limits.hpp (original)
+++ branches/release/boost/limits.hpp 2013-03-19 14:36:02 EDT (Tue, 19 Mar 2013)
@@ -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