Branch for merging Boost.Build and Boost.Jam completely.

[SVN r59143]

include/boost/static_assert.hpp

@@ -38,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
 
@@ -125,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