Release 1.46.0

[SVN r69125]
Merge trunk BOOST_ASSERT_MSG additions
2025-07-14 13:16:34 +02:00 · 2011-02-21 18:42:22 +00:00 · 2011-02-15 14:54:16 +00:00 · 2011-01-01 12:32:32 +00:00 · 2010-06-26 12:30:09 +00:00
3 changed files with 10 additions and 9 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@ -12,6 +12,7 @@ boostbook standalone
    :
        static_assert
    :
+        <xsl:param>boost.root=../../../..
        <xsl:param>nav.layout=none
        <xsl:param>navig.graphics=0
        # PDF Options:
@ -36,9 +37,3 @@ boostbook standalone
        <format>pdf:<xsl:param>admon.graphics.path=$(boost-images)/
        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
    ;
-
-install html : ../../../doc/html/boostbook.css ;
-install ../ : ../../../boost.png ;
-
-
-
--- a/doc/static_assert.qbk
+++ b/doc/static_assert.qbk
@ -16,7 +16,7 @@
 ]

 This manual is also available in 
-[@http://svn.boost.org/svn/boost/sandbox/pdf/static_assert/release/static_assert.pdf 
+[@http://sourceforge.net/projects/boost/files/boost-docs/ 
 printer friendly PDF format].

 [section:intro Overview and Tutorial]
--- a/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@ -17,6 +17,12 @@
 #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:
@ -38,7 +44,7 @@
 #  define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x)
 #endif

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

@ -125,7 +131,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 // defined(BOOST_NO_STATIC_ASSERT)

 #endif // BOOST_STATIC_ASSERT_HPP
Author	SHA1	Message	Date
Beman Dawes	456723606e	Release 1.46.0 [SVN r69125]	2011-02-21 18:42:22 +00:00
Beman Dawes	06dedcd232	Merge trunk BOOST_ASSERT_MSG additions [SVN r68912]	2011-02-15 14:54:16 +00:00
John Maddock	6f1d2476fa	Change PDF URL to SF download page. [SVN r67530]	2011-01-01 12:32:32 +00:00
Daniel James	e27a27c9f3	Merge documentation fixes. * Use `doc/src/.css` instead of `doc/html/.css`. * Remove wiki and people directories. * Some documentation fixes. * Left out `minimal.css` changes and boostbook changes because of clashes. [SVN r63347]	2010-06-26 12:30:09 +00:00