Release 1.46.1

[SVN r69890]
Merge trunk BOOST_ASSERT_MSG additions
2025-07-14 05:06: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
8 changed files with 12 additions and 59 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,28 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-#----------------------------------------------------------------------------
-# 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/static_assert_example_3.cpp
+++ b/static_assert_example_3.cpp
@ -5,7 +5,7 @@

 //  See http://www.boost.org for most recent version including documentation.

-#include <climits>
+#include <limits>
 #include <boost/limits.hpp>
 #include <boost/static_assert.hpp>

--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -1,19 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-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
				`@ -1 +0,0 @@`
				`boost_module(static_assert DEPENDS config detail)`