Release 1_46_0 beta 1

[SVN r68581]
2011-01-31 13:00:44 +00:00
1 changed files with 2 additions and 8 deletions
--- a/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@ -17,12 +17,6 @@
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>

-#ifndef BOOST_NO_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 )
-#endif
-
 #ifdef __BORLANDC__
 //
 // workaround for buggy integral-constant expression support:
@ -44,7 +38,7 @@
 #  define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x)
 #endif

-#ifndef BOOST_NO_STATIC_ASSERT
+#ifdef BOOST_HAS_STATIC_ASSERT
 #  define BOOST_STATIC_ASSERT( B ) static_assert(B, #B)
 #else

@ -131,7 +125,7 @@ template<int x> 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 // ndef BOOST_HAS_STATIC_ASSERT

 #endif // BOOST_STATIC_ASSERT_HPP