Phoenix Reloaded

[SVN r53348]

CMakeLists.txt

@@ -0,0 +1,22 @@
+#----------------------------------------------------------------------------
+# 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 
+)
+
+

doc/Jamfile.v2

@@ -12,7 +12,6 @@ boostbook standalone
     :
         static_assert
     :
-        <xsl:param>boost.root=../../../..
         <xsl:param>nav.layout=none
         <xsl:param>navig.graphics=0
         # PDF Options:
@@ -37,3 +36,9 @@ 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 ;
+
+
+

doc/static_assert.qbk

@@ -16,33 +16,20 @@
 ]
 
 This manual is also available in 
-[@http://sourceforge.net/projects/boost/files/boost-docs/ 
+[@http://svn.boost.org/svn/boost/sandbox/pdf/static_assert/release/static_assert.pdf 
 printer friendly PDF format].
 
 [section:intro Overview and Tutorial]
 
-The header `<boost/static_assert.hpp>` supplies two macros:
-
-   BOOST_STATIC_ASSERT(x)
-   BOOST_STATIC_ASSERT_MSG(x, msg)
-   
-Both generate a compile time error message if the integral-constant-expression `x`
-is not true. In other words, they are the compile time equivalent of the assert macro; 
+The header `<boost/static_assert.hpp>` supplies a single macro `BOOST_STATIC_ASSERT(x)`, 
+which generates a compile time error message if the integral-constant-expression `x`
+is not true. In other words it is the compile time equivalent of the assert macro; 
 this is sometimes known as a "compile-time-assertion", but will be called a 
 "static assertion" throughout these docs. Note that if the condition is `true`, 
-then the macros will generate neither code nor data - and the macros can also 
+then the macro will generate neither code nor data - and the macro can also 
 be used at either namespace, class or function scope. When used in a template, 
 the static assertion will be evaluated at the time the template is instantiated; 
-this is particularly useful for validating template parameters.
-
-If the C++0x `static_assert` feature is available, both macros will use it.
-For `BOOST_STATIC_ASSERT(x)`, the error message with be a stringized version of `x`.
-For `BOOST_STATIC_ASSERT_MSG(x, msg)`, the error message will be the `msg` string.
-
-If the C++0x `static_assert` feature is not available, `BOOST_STATIC_ASSERT_MSG(x, msg)`
-will be treated as `BOOST_STATIC_ASSERT(x)`.
-
-The material that follows assumes the C++0x `static_assert` feature is not available.
+this is particularly useful for validating template parameters. 
 
 One of the aims of `BOOST_STATIC_ASSERT` is to generate readable error messages. 
 These immediately tell the user that a library is being used in a manner that 

include/boost/static_assert.hpp

@@ -17,12 +17,6 @@
 #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:
@@ -44,7 +38,7 @@
 #  define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x)
 #endif
 
-#ifndef BOOST_NO_STATIC_ASSERT
+#ifdef BOOST_HAS_STATIC_ASSERT
 #  define BOOST_STATIC_ASSERT( B ) static_assert(B, #B)
 #else
 
@@ -131,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 // defined(BOOST_NO_STATIC_ASSERT)
+#endif // ndef BOOST_HAS_STATIC_ASSERT
 
 #endif // BOOST_STATIC_ASSERT_HPP
 

module.cmake

@@ -0,0 +1 @@
+boost_module(static_assert DEPENDS config detail)

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...

static_assert_test.cpp

@@ -16,16 +16,12 @@
 // Namespace scope
 BOOST_STATIC_ASSERT(sizeof(int) >= sizeof(short));
 BOOST_STATIC_ASSERT(sizeof(char) == 1);
-BOOST_STATIC_ASSERT_MSG(sizeof(int) >= sizeof(short), "msg1");
-BOOST_STATIC_ASSERT_MSG(sizeof(char) == 1, "msg2");
 
 // Function (block) scope
 void f()
 {
   BOOST_STATIC_ASSERT(sizeof(int) >= sizeof(short));
   BOOST_STATIC_ASSERT(sizeof(char) == 1);
-  BOOST_STATIC_ASSERT_MSG(sizeof(int) >= sizeof(short), "msg3");
-  BOOST_STATIC_ASSERT_MSG(sizeof(char) == 1, "msg4");
 }
 
 struct Bob
@@ -33,8 +29,6 @@ struct Bob
   private:  // can be in private, to avoid namespace pollution
     BOOST_STATIC_ASSERT(sizeof(int) >= sizeof(short));
     BOOST_STATIC_ASSERT(sizeof(char) == 1);
-    BOOST_STATIC_ASSERT_MSG(sizeof(int) >= sizeof(short), "msg5");
-    BOOST_STATIC_ASSERT_MSG(sizeof(char) == 1, "msg6");
   public:
 
   // Member function scope: provides access to member variables
@@ -42,11 +36,9 @@ struct Bob
   char c;
   int f()
   {
-#if defined(_MSC_VER) && _MSC_VER < 1300 // broken sizeof in VC6
+#ifndef _MSC_VER // broken sizeof in VC6
     BOOST_STATIC_ASSERT(sizeof(x) >= sizeof(short));
     BOOST_STATIC_ASSERT(sizeof(c) == 1);
-    BOOST_STATIC_ASSERT_MSG(sizeof(x) >= sizeof(short), "msg7");
-    BOOST_STATIC_ASSERT_MSG(sizeof(c) == 1, "msg8");
 #endif
     return x;
   }
@@ -60,7 +52,6 @@ struct Bill
 {
   private:  // can be in private, to avoid namespace pollution
     BOOST_STATIC_ASSERT(sizeof(Int) > sizeof(char));
-    BOOST_STATIC_ASSERT_MSG(sizeof(Int) > sizeof(char), "msg9");
   public:
 
   // Template member function scope: provides access to member variables
@@ -71,12 +62,10 @@ struct Bill
   {
     BOOST_STATIC_ASSERT(sizeof(Int) == sizeof(Int2));
     BOOST_STATIC_ASSERT(sizeof(Char) == sizeof(Char2));
-    BOOST_STATIC_ASSERT_MSG(sizeof(Int) == sizeof(Int2), "msg10");
-    BOOST_STATIC_ASSERT_MSG(sizeof(Char) == sizeof(Char2), "msg11");
   }
 };
 
-void test_Bill() // BOOST_STATIC_ASSERTs are not triggerred until instantiated
+void test_Bill() // BOOST_CT_ASSERTs are not triggerred until instantiated
 {
   Bill<int, char> z;
   //Bill<int, int> bad; // will not compile

test/CMakeLists.txt

@@ -0,0 +1,13 @@
+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)