From 5233df9b9e7780267d993c2959d5d7474fea4a65 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Mon, 10 Dec 2012 17:28:53 +0000 Subject: [PATCH] Merge changes from Trunk. [SVN r81828] --- doc/static_assert.qbk | 2 +- include/boost/static_assert.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/static_assert.qbk b/doc/static_assert.qbk index 97a7418..0cc8cfc 100644 --- a/doc/static_assert.qbk +++ b/doc/static_assert.qbk @@ -36,7 +36,7 @@ the static assertion will be evaluated at the time the template is instantiated; this is particularly useful for validating template parameters. If the C++0x `static_assert` feature is available, both macros will use it. -For `BOOST_STATIC_ASSERT(x)`, the error message with be a stringized version of `x`. +For `BOOST_STATIC_ASSERT(x)`, the error message will be a stringized version of `x`. For `BOOST_STATIC_ASSERT_MSG(x, msg)`, the error message will be the `msg` string. If the C++0x `static_assert` feature is not available, `BOOST_STATIC_ASSERT_MSG(x, msg)` diff --git a/include/boost/static_assert.hpp b/include/boost/static_assert.hpp index 9fe9bc0..0bc3ef6 100644 --- a/include/boost/static_assert.hpp +++ b/include/boost/static_assert.hpp @@ -17,7 +17,7 @@ #include #include -#ifndef BOOST_NO_STATIC_ASSERT +#ifndef BOOST_NO_CXX11_STATIC_ASSERT # define BOOST_STATIC_ASSERT_MSG( B, Msg ) static_assert(B, Msg) #else # define BOOST_STATIC_ASSERT_MSG( B, Msg ) BOOST_STATIC_ASSERT( B ) @@ -44,7 +44,7 @@ # define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x) #endif -#ifndef BOOST_NO_STATIC_ASSERT +#ifndef BOOST_NO_CXX11_STATIC_ASSERT # define BOOST_STATIC_ASSERT( B ) static_assert(B, #B) #else @@ -131,7 +131,7 @@ template struct static_assert_test{}; enum { BOOST_JOIN(boost_static_assert_enum_, __LINE__) \ = sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >) } #endif -#endif // defined(BOOST_NO_STATIC_ASSERT) +#endif // defined(BOOST_NO_CXX11_STATIC_ASSERT) #endif // BOOST_STATIC_ASSERT_HPP