From f298ed51a9378187ea6d49a6ef77cfd475681fee Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Sun, 25 Nov 2007 18:07:19 +0000
Subject: [PATCH] Full merge from trunk at revision 41356 of entire boost-root
 tree.

[SVN r41369]
---
 include/boost/static_assert.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/boost/static_assert.hpp b/include/boost/static_assert.hpp
index 9d24c05..3ffa952 100644
--- a/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@@ -28,6 +28,10 @@
 #  define BOOST_SA_GCC_WORKAROUND
 #endif
 
+#ifdef BOOST_HAS_STATIC_ASSERT
+#  define BOOST_STATIC_ASSERT( B ) static_assert(B, #B)
+#else
+
 namespace boost{
 
 // HP aCC cannot deal with missing names for template value parameters
@@ -111,7 +115,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 // ndef BOOST_HAS_STATIC_ASSERT
 
 #endif // BOOST_STATIC_ASSERT_HPP