Release 1.46.1

[SVN r69890]
Merge trunk BOOST_ASSERT_MSG additions
2025-07-13 12:46:33 +02:00 · 2011-03-12 15:41:16 +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 · 2009-12-07 13:23:38 +00:00
7 changed files with 11 additions and 46 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,22 +0,0 @@
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    static_assert.hpp
-    
-)
-
-# Add a library target to the build system
-boost_library_project(
-  static_assert
-  #  SRCDIRS 
-  TESTDIRS  test
-  HEADERS ${lib_headers}
-  #  DOCDIRS 
-  #  DESCRIPTION 
-  MODULARIZED 
-  #  AUTHORS 
-  #  MAINTAINERS 
-)
-
-
--- 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

--- a/module.cmake
+++ b/module.cmake
@ -1 +0,0 @@
-boost_module(static_assert DEPENDS config detail)
--- a/static_assert_example_2.cpp
+++ b/static_assert_example_2.cpp
@ -12,7 +12,7 @@
 #include <boost/type_traits.hpp>

 template <class RandomAccessIterator >
-RandomAccessIterator foo(RandomAccessIterator from, RandomAccessIterator to)
+RandomAccessIterator foo(RandomAccessIterator from, RandomAccessIterator /*to*/)
 {
   // this template can only be used with
   // random access iterators...
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -1,13 +0,0 @@
-boost_test_run(static_assert_test ../static_assert_test.cpp)
-boost_test_run(static_assert_example_2 ../static_assert_example_2.cpp)
-boost_test_run(static_assert_example_3 ../static_assert_example_3.cpp)
-boost_test_compile_fail(static_assert_test_fail_1 ../static_assert_test_fail_1.cpp)
-boost_test_compile_fail(static_assert_test_fail_2 ../static_assert_test_fail_2.cpp)
-boost_test_compile_fail(static_assert_test_fail_3 ../static_assert_test_fail_3.cpp)
-boost_test_compile_fail(static_assert_test_fail_4 ../static_assert_test_fail_4.cpp)
-boost_test_compile_fail(static_assert_test_fail_5 ../static_assert_test_fail_5.cpp)
-boost_test_compile_fail(static_assert_test_fail_6 ../static_assert_test_fail_6.cpp)
-boost_test_compile_fail(static_assert_test_fail_7 ../static_assert_test_fail_7.cpp)
-boost_test_compile_fail(static_assert_test_fail_8 ../static_assert_test_fail_8.cpp)
-boost_test_compile_fail(static_assert_test_fail_9 ../static_assert_test_fail_9.cpp)
-boost_test_compile_fail(static_assert_test_fail_10 ../static_assert_test_fail_10.cpp)
Author	SHA1	Message	Date
Beman Dawes	60d780b45c	Release 1.46.1 [SVN r69890]	2011-03-12 15:41:16 +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
John Maddock	12f96b5653	Merge warning fixes from Trunk. [SVN r58217]	2009-12-07 13:23:38 +00:00
Troy D. Straszheim	23d7abde22	rm cmake from the release branch before it goes out broken. Policy dictates that you never commit to release, you commit to trunk and merge to release. [SVN r56941]	2009-10-17 01:10:45 +00:00
Troy D. Straszheim	9e4d6dfeff	Add basic copyright/license to keep cmake out of the inspection report [SVN r55095]	2009-07-22 21:51:01 +00:00
John Maddock	2637358ba9	Merge PDF build changes from Trunk. [SVN r51417]	2009-02-23 18:39:32 +00:00
Troy D. Straszheim	9e411076c6	merge of cmake build files from trunk per beman [SVN r50756]	2009-01-24 18:57:20 +00:00
Daniel James	3488b2bdf2	Merge some documentation updates and fixes from trunk. Merged revisions 47364,47402-47403 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r47364 \| danieljames \| 2008-07-12 20:32:15 +0100 (Sat, 12 Jul 2008) \| 1 line Fix a PDF link that I missed before. (in static assert) ........ r47402 \| danieljames \| 2008-07-13 20:42:56 +0100 (Sun, 13 Jul 2008) \| 2 lines Note that emplace is only available on a few compilers. ........ r47403 \| danieljames \| 2008-07-13 21:07:45 +0100 (Sun, 13 Jul 2008) \| 2 lines Update the implementation details. ........ [SVN r47405]	2008-07-13 21:08:33 +00:00
John Maddock	28e09a3cca	Merge changes from Trunk. [SVN r47306]	2008-07-11 10:49:31 +00:00
John Maddock	481c2efbac	Merge minor change from Trunk. [SVN r43358]	2008-02-21 16:51:41 +00:00
Beman Dawes	3b702727b9	Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41370]	2007-11-25 18:38:02 +00:00
Beman Dawes	f298ed51a9	Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41369]	2007-11-25 18:07:19 +00:00
Beman Dawes	851fd2622e	Starting point for releases [SVN r39706]	2007-10-05 14:25:06 +00:00
nobody	720fb456d5	This commit was manufactured by cvs2svn to create tag 'Version_1_34_1'. [SVN r38286]	2007-07-24 19:28:14 +00:00
John Maddock	2fa11699bf	Added links to PDF docs. [SVN r37653]	2007-05-09 17:20:56 +00:00
Rene Rivera	69dbf6f12d	Remove obsolete Boost.Build v1 files. [SVN r35880]	2006-11-06 17:10:46 +00:00
John Maddock	66dd3d2595	Added trivial docs change, based on user suggestion, and brought example code into synch. [SVN r34874]	2006-08-11 18:14:13 +00:00
John Maddock	7a0a3fbf32	Added license info. [SVN r34585]	2006-07-17 10:49:22 +00:00
nobody	c5de8ff789	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r33417]	2006-03-21 02:26:31 +00:00
				`@ -1 +0,0 @@`
				`boost_module(static_assert DEPENDS config detail)`