v2, v3, integration branch

[SVN r62649]
Use BOOST_NO_STATIC_ASSERT
2010-06-09 11:34:33 +00:00 · 2010-02-16 12:45:53 +00:00 · 2009-11-08 18:59:24 +00:00 · 2009-10-17 02:07:38 +00:00 · 2009-07-26 00:49:56 +00:00
5 changed files with 3 additions and 39 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/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@ -38,7 +38,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 +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 // 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	4156b6d1db	v2, v3, integration branch [SVN r62649]	2010-06-09 11:34:33 +00:00
Beman Dawes	80c6340833	Use BOOST_NO_STATIC_ASSERT [SVN r59698]	2010-02-16 12:45:53 +00:00
John Maddock	138c5bde91	Fix gcc warning. [SVN r57495]	2009-11-08 18:59:24 +00:00
Troy D. Straszheim	5d9274a683	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Troy D. Straszheim	87ecd7d39f	Copyrights on CMakeLists.txt to keep them from clogging up the inspect reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]	2009-07-26 00:49:56 +00:00
				`@ -1 +0,0 @@`
				`boost_module(static_assert DEPENDS config detail)`