[Boost-commit] svn:boost r81828 - in branches/release: boost libs/static_assert libs/static_assert/doc

Subject: [Boost-commit] svn:boost r81828 - in branches/release: boost libs/static_assert libs/static_assert/doc
From: john_at_[hidden]
Date: 2012-12-10 12:28:54

Author: johnmaddock
Date: 2012-12-10 12:28:53 EST (Mon, 10 Dec 2012)
New Revision: 81828
URL: http://svn.boost.org/trac/boost/changeset/81828

Log:
Merge changes from Trunk.
Properties modified: 
   branches/release/libs/static_assert/   (props changed)
Text files modified: 
   branches/release/boost/static_assert.hpp                  |     6 +++---                                  
   branches/release/libs/static_assert/doc/static_assert.qbk |     2 +-                                      
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: branches/release/boost/static_assert.hpp
==============================================================================
--- branches/release/boost/static_assert.hpp	(original)
+++ branches/release/boost/static_assert.hpp	2012-12-10 12:28:53 EST (Mon, 10 Dec 2012)
@@ -17,7 +17,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 
-#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 @@
    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
 

Modified: branches/release/libs/static_assert/doc/static_assert.qbk
==============================================================================
--- branches/release/libs/static_assert/doc/static_assert.qbk	(original)
+++ branches/release/libs/static_assert/doc/static_assert.qbk	2012-12-10 12:28:53 EST (Mon, 10 Dec 2012)
@@ -36,7 +36,7 @@
 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)`