This commit was manufactured by cvs2svn to create branch

'python-v2-dev'. [SVN r14785]
2025-06-27 21:11:01 +02:00 · 2002-08-12 13:35:54 +00:00
18 changed files with 316 additions and 361 deletions
--- a/31
+++ b/31
@ -1,25 +1,16 @@
 # copyright John Maddock 2003
 subproject libs/static_assert ;
 # bring in the rules for testing
 import testing ;
 test-suite static_assert :
   [ run static_assert_test.cpp ]
 #  [ run static_assert_example_1.cpp ]
   [ run static_assert_example_2.cpp ]
   [ run static_assert_example_3.cpp ]
   [ compile-fail static_assert_test_fail_1.cpp ]
   [ compile-fail static_assert_test_fail_2.cpp ]
   [ compile-fail static_assert_test_fail_3.cpp ]
   [ compile-fail static_assert_test_fail_4.cpp ]
   [ compile-fail static_assert_test_fail_5.cpp ]
   [ compile-fail static_assert_test_fail_6.cpp ]
   [ compile-fail static_assert_test_fail_7.cpp ]
   [ compile-fail static_assert_test_fail_8.cpp ]
 ;
 unit-test static_assert_test : static_assert_test.cpp
 	: <sysinclude>$(BOOST_ROOT) : ;
 unit-test static_assert_example_1 : static_assert_example_1.cpp
 	: <sysinclude>$(BOOST_ROOT) : ;
 unit-test static_assert_example_2 : static_assert_example_2.cpp
 	: <sysinclude>$(BOOST_ROOT) : ;
 unit-test static_assert_example_3 : static_assert_example_3.cpp
 	: <sysinclude>$(BOOST_ROOT) : ;
--- a/Jamfile.v2
+++ b/Jamfile.v2
@ -1,24 +0,0 @@
 # copyright John Maddock 2003
 # bring in the rules for testing
 import testing ;
 test-suite static_assert :
 	[ run static_assert_test.cpp ]
 #	[ run static_assert_example_1.cpp ]
 	[ run static_assert_example_2.cpp ]
 	[ run static_assert_example_3.cpp ]
 	[ compile-fail static_assert_test_fail_1.cpp ]
 	[ compile-fail static_assert_test_fail_2.cpp ]
 	[ compile-fail static_assert_test_fail_3.cpp ]
 	[ compile-fail static_assert_test_fail_4.cpp ]
 	[ compile-fail static_assert_test_fail_5.cpp ]
 	[ compile-fail static_assert_test_fail_6.cpp ]
 	[ compile-fail static_assert_test_fail_7.cpp ]
 	[ compile-fail static_assert_test_fail_8.cpp ]
 ;
--- a/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@ -1,9 +1,10 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
-//  See http://www.boost.org/libs/static_assert for documentation.
+//  See http://www.boost.org for most recent version including documentation.
 /*
 Revision history:
@ -15,7 +16,6 @@
 #define BOOST_STATIC_ASSERT_HPP
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 #ifdef __BORLANDC__
 //
@ -23,17 +23,12 @@
 #define BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS
 #endif
 #if defined(__GNUC__) && (__GNUC__ == 3) && ((__GNUC_MINOR__ == 3) || (__GNUC_MINOR__ == 4))
 // gcc 3.3 and 3.4 don't produce good error messages with the default version:
 #  define BOOST_SA_GCC_WORKAROUND
 #endif
 namespace boost{
 // HP aCC cannot deal with missing names for template value parameters
 template <bool x> struct STATIC_ASSERTION_FAILURE;
-template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
+template <> struct STATIC_ASSERTION_FAILURE<true>{};
 // HP aCC cannot deal with missing names for template value parameters
 template<int x> struct static_assert_test{};
@ -62,44 +57,20 @@ template<int x> struct static_assert_test{};
 // style casts: too many compilers currently have problems with static_cast
 // when used inside integral constant expressions.
 //
-#if !defined(BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS) && \
+#if !defined(BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS) && !defined(__MWERKS__)
-    !BOOST_WORKAROUND(__MWERKS__, < 0x3003)
+#ifndef BOOST_MSVC
-
+#define BOOST_STATIC_ASSERT( B ) \
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+   typedef ::boost::static_assert_test<\
      sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >)>\
         BOOST_JOIN(boost_static_assert_typedef_, __LINE__)
 #else
 // __LINE__ macro broken when -ZI is used see Q199057
 // fortunately MSVC ignores duplicate typedef's.
 #define BOOST_STATIC_ASSERT( B ) \
   typedef ::boost::static_assert_test<\
      sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >)\
      > boost_static_assert_typedef_
 #elif defined(BOOST_MSVC)
 #define BOOST_STATIC_ASSERT( B ) \
   typedef ::boost::static_assert_test<\
      sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >)>\
         BOOST_JOIN(boost_static_assert_typedef_, __COUNTER__)
 #elif defined(BOOST_INTEL_CXX_VERSION) || defined(BOOST_SA_GCC_WORKAROUND)
 // agurt 15/sep/02: a special care is needed to force Intel C++ issue an error 
 // instead of warning in case of failure
 # define BOOST_STATIC_ASSERT( B ) \
    typedef char BOOST_JOIN(boost_static_assert_typedef_, __LINE__) \
        [ ::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >::value ]
 #elif defined(__sgi)
 // special version for SGI MIPSpro compiler
 #define BOOST_STATIC_ASSERT( B ) \
   BOOST_STATIC_CONSTANT(bool, \
     BOOST_JOIN(boost_static_assert_test_, __LINE__) = ( B )); \
   typedef ::boost::static_assert_test<\
     sizeof(::boost::STATIC_ASSERTION_FAILURE< \
       BOOST_JOIN(boost_static_assert_test_, __LINE__) >)>\
         BOOST_JOIN(boost_static_assert_typedef_, __LINE__)
 #else
 // generic version
 #define BOOST_STATIC_ASSERT( B ) \
   typedef ::boost::static_assert_test<\
      sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >)>\
         BOOST_JOIN(boost_static_assert_typedef_, __LINE__)
 #endif
 #else
 // alternative enum based implementation:
 #define BOOST_STATIC_ASSERT( B ) \
@ -111,3 +82,5 @@ template<int x> struct static_assert_test{};
 #endif // BOOST_STATIC_ASSERT_HPP
--- a/index.html
+++ b/index.html
@ -1,9 +0,0 @@
 <html>
 <head>
 <meta http-equiv="refresh" content="0; URL=static_assert.htm">
 </head>
 <body>
 Automatic redirection failed, please go to
 <a href="static_assert.htm">static_assert.htm</a>.
 </body>
 </html>
--- a/static_assert.htm
+++ b/static_assert.htm
@ -1,48 +1,58 @@
 <html>
-   <head>
+
-      <title>static assertions</title>
+<head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type"
-      <meta name="Template" content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
+content="text/html; charset=iso-8859-1">
-      <meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
+<meta name="Template"
-   </head>
+content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
-   <body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080">
+<meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
-      <h1><img src="../../boost.png" width="276" height="86">Header &lt;<a href="../../boost/static_assert.hpp">boost/static_assert.hpp</a>&gt;</h1>
+<title>static assertions</title>
-      <H3>Contents</H3>
+</head>
-      <dl class="index">
+
-         <dt><a href="#overview">Overview</a> <dt><a href="#namespace">Use at namespace scope</a>
+<body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
-               <dt><a href="#function">Use at function scope</a> <dt><a href="#class">Use at class 
+vlink="#800080">
-                        scope</a> <dt><a href="#templates">Use in templates</a> <dt><a href="#how">How it 
+
-                              works</a> <dt><a href="#test">Test programs</a></dt>
+<h1><img src="../../c++boost.gif" width="276" height="86">Header
-      </dl>
+&lt;<a href="../../boost/static_assert.hpp">boost/static_assert.hpp</a>&gt;</h1>
-      <H3><A name="overview"></A>Overview</H3>
+
-      <P>The header &lt;boost/static_assert.hpp&gt; supplies a single macro 
+<p>The header &lt;boost/static_assert.hpp&gt; supplies a single
-         BOOST_STATIC_ASSERT(x), which generates a compile time error message if the <a href="../../more/int_const_guidelines.htm">
+macro BOOST_STATIC_ASSERT(x), which generates a compile time
-            integral-constant-expression</a> <i>x</i> is not true. In other words it is 
+error message if the <a
-         the compile time equivalent of the assert macro; this is sometimes known as a 
+href="../../more/int_const_guidelines.htm">integral-constant-expression</a>
-         "compile-time-assertion", but will be called a "static assertion" throughout 
+<i>x</i> is not true. In other words it is the compile time
-         these docs. Note that if the condition is true, then the macro will generate 
+equivalent of the assert macro; this is sometimes known as a
-         neither code nor data - and the macro can also be used at either namespace, 
+&quot;compile-time-assertion&quot;, but will be called a &quot;static
-         class or function scope. When used in a template, the static assertion will be 
+assertion&quot; throughout these docs. Note that if the condition
-         evaluated at the time the template is instantiated; this is particularly useful 
+is true, then the macro will generate neither code nor data - and
-         for validating template parameters.
+the macro can also be used at either namespace, class or function
-      </P>
+scope. When used in a template, the static assertion will be
-      <p>One of the aims of BOOST_STATIC_ASSERT is to generate readable error messages. 
+evaluated at the time the template is instantiated; this is
-         These immediately tell the user that a library is being used in a manner that 
+particularly useful for validating template parameters. </p>
-         is not supported. While error messages obviously differ from compiler to 
+
-         compiler, but you should see something like:
+<p>One of the aims of BOOST_STATIC_ASSERT is to generate readable
-      </p>
+error messages. These immediately tell the user that a library is
-      <pre>Illegal use of STATIC_ASSERTION_FAILURE&lt;false&gt;</pre>
+being used in a manner that is not supported. While error
-      <p>Which is intended to at least catch the eye!</p>
+messages obviously differ from compiler to compiler, but you
-      <p>You can use BOOST_STATIC_ASSERT at any place where you can place a declaration, 
+should see something like: </p>
-         that is at <a href="#class">class</a>, <a href="#function">function</a> or <a href="#namespace">
+
-            namespace</a> scope, this is illustrated by the following examples:</p>
+<pre>Illegal use of COMPILE_TIME_ASSERTION_FAILURE&lt;false&gt;</pre>
-      <h3><a name="namespace"></a><A name="namespace"></A>Use at namespace scope.</h3>
+
-      <p>The macro can be used at namespace scope, if there is some requirement must 
+<p>Which is intended to at least catch the eye!</p>
-         always be true; generally this means some platform specific requirement. 
+
-         Suppose we require that <b>int</b> be at least a 32-bit integral type, and that <b>
+<p>You can use BOOST_STATIC_ASSERT at any place where you can
-            wchar_t</b> be an unsigned type. We can verify this at compile time as 
+place a declaration, that is at <a href="#class">class</a>, <a
-         follows:</p>
+href="#function">function</a> or <a href="#namespace">namespace</a>
-      <pre>#include &lt;climits&gt;
+scope, this is illustrated by the following examples:</p>
 <h3><a name="namespace"></a>Use at namespace scope.</h3>
 <p>The macro can be used at namespace scope, if there is some
 requirement must always be true; generally this means some
 platform specific requirement. Suppose we require that <b>int</b>
 be at least a 32-bit integral type, and that <b>wchar_t</b> be an
 unsigned type. We can verify this at compile time as follows:</p>
 <pre>#include &lt;climits&gt;
 #include &lt;cwchar&gt;
 #include &lt;boost/static_assert.hpp&gt;
@ -53,31 +63,40 @@ BOOST_STATIC_ASSERT(WCHAR_MIN &gt;= 0);
 } // namespace my_conditions
 </pre>
-      <p>The use of the namespace <i>my_conditions</i> here requires some comment. The 
+
-         macro BOOST_STATIC_ASSERT works by generating an <strong>typedef</strong> declaration, 
+<p>The use of the namespace <i>my_conditions</i> here requires
-         and since the typedef must have a name, the macro generates one automatically 
+some comment. The macro BOOST_STATIC_ASSERT works by generating
-         by mangling a stub name with the value of __LINE__. When BOOST_STATIC_ASSERT is 
+an <strong>typedef</strong> declaration, and since the typedef
-         used at either class or function scope then each use of BOOST_STATIC_ASSERT is 
+must have a name, the macro generates one automatically by
-         guaranteed to produce a name unique to that scope (provided you only use the 
+mangling a stub name with the value of __LINE__. When
-         macro once on each line). However when used in a header at namespace scope, 
+BOOST_STATIC_ASSERT is used at either class or function scope
-         that namespace can be continued over multiple headers, each of which may have 
+then each use of BOOST_STATIC_ASSERT is guaranteed to produce a
-         their own static assertions, and on the "same" lines, thereby generating 
+name unique to that scope (provided you only use the macro once
-         duplicate declarations. In theory the compiler should silently ignore duplicate 
+on each line). However when used in a header at namespace scope,
-         typedef declarations, however many do not do so (and even if they do they are 
+that namespace can be continued over multiple headers, each of
-         entitled to emit warnings in such cases). To avoid potential problems, if you 
+which may have their own static assertions, and on the &quot;same&quot;
-         use BOOST_STATIC_ASSERT in a header and at namespace scope, then enclose them 
+lines, thereby generating duplicate declarations. In theory the
-         in a namespace unique to that header.</p>
+compiler should silently ignore duplicate typedef declarations,
-      <h3><a name="function"></a><A name="function"></A>Use at function scope</h3>
+however many do not do so (and even if they do they are entitled
-      <p>The macro is typically used at function scope inside template functions, when 
+to emit warnings in such cases). To avoid potential problems, if
-         the template arguments need checking. Imagine that we have an iterator-based 
+you use BOOST_STATIC_ASSERT in a header and at namespace scope,
-         algorithm that requires random access iterators. If the algorithm is 
+then enclose them in a namespace unique to that header.</p>
-         instantiated with iterators that do not meet our requirements then an error 
+
-         will be generated eventually, but this may be nested deep inside several 
+<h3><a name="function"></a>Use at function scope</h3>
-         templates, making it hard for the user to determine what went wrong. One option 
+
-         is to add a static assertion at the top level of the template, in that case if 
+<p>The macro is typically used at function scope inside template
-         the condition is not met, then an error will be generated in a way that makes 
+functions, when the template arguments need checking. Imagine
-         it reasonably obvious to the user that the template is being misused.</p>
+that we have an iterator-based algorithm that requires random
-      <pre>#include &lt;iterator&gt;
+access iterators. If the algorithm is instantiated with iterators
 that do not meet our requirements then an error will be generated
 eventually, but this may be nested deep inside several templates,
 making it hard for the user to determine what went wrong. One
 option is to add a static assertion at the top level of the
 template, in that case if the condition is not met, then an error
 will be generated in a way that makes it reasonably obvious to
 the user that the template is being misused.</p>
 <pre>#include &lt;iterator&gt;
 #include &lt;boost/static_assert.hpp&gt;
 #include &lt;boost/type_traits.hpp&gt;
@ -92,19 +111,24 @@ RandomAccessIterator foo(RandomAccessIterator from, RandomAccessIterator to)
   // detail goes here...
   return from;
 }</pre>
-      <p>A couple of footnotes are in order here: the extra set of parenthesis around 
+
-         the assert, is to prevent the comma inside the is_convertible template being 
+<p>A couple of footnotes are in order here: the extra set of
-         interpreted by the preprocessor as a macro argument separator; the target type 
+parenthesis around the assert, is to prevent the comma inside the
-         for is_convertible is a reference type, as some compilers have problems using 
+is_convertible template being interpreted by the preprocessor as
-         is_convertible when the conversion is via a user defined constructor (in any 
+a macro argument separator; the target type for is_convertible is
-         case there is no guarantee that the iterator tag classes are 
+a reference type, as some compilers have problems using
-         copy-constructible).</p>
+is_convertible when the conversion is via a user defined
-      <h3><a name="class"></a><A name="class"></A>Use at class scope</h3>
+constructor (in any case there is no guarantee that the iterator
-      <p>The macro is typically used inside classes that are templates. Suppose we have 
+tag classes are copy-constructible).</p>
-         a template-class that requires an unsigned integral type with at least 16-bits 
+
-         of precision as a template argument, we can achieve this using something like 
+<h3><a name="class"></a>Use at class scope</h3>
-         this:</p>
+
-      <pre>#include &lt;climits&gt;
+<p>The macro is typically used inside classes that are templates.
 Suppose we have a template-class that requires an unsigned
 integral type with at least 16-bits of precision as a template
 argument, we can achieve this using something like this:</p>
 <pre>#include &lt;climits&gt;
 #include &lt;boost/static_assert.hpp&gt;
 template &lt;class UnsignedInt&gt;
@ -119,126 +143,137 @@ public:
   /* details here */
 };
 </pre>
-      <h3><A name="templates"></A>Use in templates</h3>
+
-      <P>Normally static assertions when used inside a class or function template, will 
+<h3>How it works</h3>
-         not be instantiated until the template in which it is used is 
+
-         instantiated.&nbsp; However, there is one potential problem to watch out for: 
+<p>BOOST_STATIC_ASSERT works as follows. There is class
-         if the static assertion is <EM>not</EM> dependent upon&nbsp;one or 
+STATIC_ASSERTION_FAILURE which is defined as:</p>
-         more&nbsp;template parameters, then the compiler is permitted to evaluate the 
+
-         static assertion at the point it is first seen, irrespective of whether the 
+<pre>namespace boost{
         template is ever instantiated, for example:</P>
      <PRE>template &lt;class T&gt;<BR>struct must_not_be_instantiated<BR>{<BR>   BOOST_STATIC_ASSERT(false);<BR><BR><BR><BR>};</PRE>
      <P>Will produce a compiler error with some compilers (for example Intel 8.1 or gcc 
         3.4), regardless of whether the template is ever instantiated.&nbsp; A 
         workaround in cases like this is to force the assertion to be dependent upon a 
         template parameter:</P>
      <PRE>template &lt;class T&gt;<BR>struct must_not_be_instantiated<BR>{<BR>   BOOST_STATIC_ASSERT(sizeof(T) == 0); // will be triggered if this type is instantiated<BR><BR><BR><BR>};</PRE>
      <H3><A name="how"></A>How it works</H3>
      <p>BOOST_STATIC_ASSERT works as follows. There is class STATIC_ASSERTION_FAILURE 
         which is defined as:</p>
      <pre>namespace boost{
 template &lt;bool&gt; struct STATIC_ASSERTION_FAILURE;
 template &lt;&gt; struct STATIC_ASSERTION_FAILURE&lt;true&gt;{};
 }</pre>
-      <p>The key feature is that the error message triggered by the undefined expression 
+
-         sizeof(STATIC_ASSERTION_FAILURE&lt;0&gt;), tends to be consistent across a wide 
+<p>The key feature is that the error message triggered by the
-         variety of compilers. The rest of the machinery of BOOST_STATIC_ASSERT is just 
+undefined expression sizeof(STATIC_ASSERTION_FAILURE&lt;0&gt;),
-         a way to feed the sizeof expression into a typedef. The use of a macro here is 
+tends to be consistent across a wide variety of compilers. The
-         somewhat ugly; however boost members have spent considerable effort trying to 
+rest of the machinery of BOOST_STATIC_ASSERT is just a way to
-         invent a static assert that avoided macros, all to no avail. The general 
+feed the sizeof expression into a typedef. The use of a macro
-         conclusion was that the good of a static assert working at namespace, function, 
+here is somewhat ugly; however boost members have spent
-         and class scope outweighed the ugliness of a macro.</p>
+considerable effort trying to invent a static assert that avoided
-      <h3><A name="test"></A>Test Programs</h3>
+macros, all to no avail. The general conclusion was that the good
-      <p>The following test programs are provided with this library:</p>
+of a static assert working at namespace, function, and class
-      <table border="0" width="100%">
+scope outweighed the ugliness of a macro.</p>
-         <tr>
+
-            <td width="33%"><i>Test Program</i></td>
+<h3>Test Programs</h3>
-            <td width="33%"><i>Expected to Compile</i></td>
+
-            <td width="34%"><i>Description</i></td>
+<p>The following test programs are provided with this library:</p>
-         </tr>
+
-         <tr>
+<table border="0" width="100%">
-            <td width="33%"><a href="static_assert_test.cpp">static_assert_test.cpp</a></td>
+    <tr>
-            <td width="33%">Yes</td>
+        <td width="33%"><i>Test Program</i></td>
-            <td width="34%">Illustrates usage, and should always compile, really just tests 
+        <td width="33%"><i>Expected to Compile</i></td>
-               compiler compatibility.</td>
+        <td width="34%"><i>Description</i></td>
-         </tr>
+    </tr>
-         <tr>
+    <tr>
-            <td width="33%"><a href="static_assert_example_1.cpp">static_assert_example_1.cpp</a></td>
+        <td width="33%"><a href="static_assert_test.cpp">static_assert_test.cpp</a></td>
-            <td width="33%">Platform dependent.</td>
+        <td width="33%">Yes</td>
-            <td width="34%">Namespace scope test program, may compile depending upon the 
+        <td width="34%">Illustrates usage, and should always
-               platform.</td>
+        compile, really just tests compiler compatibility.</td>
-         </tr>
+    </tr>
-         <tr>
+    <tr>
-            <td width="33%"><a href="static_assert_example_2.cpp">static_assert_example_2.cpp</a></td>
+        <td width="33%"><a href="static_assert_example_1.cpp">static_assert_example_1.cpp</a></td>
-            <td width="33%">Yes</td>
+        <td width="33%">Platform dependent.</td>
-            <td width="34%">Function scope test program.</td>
+        <td width="34%">Namespace scope test program, may compile
-         </tr>
+        depending upon the platform.</td>
-         <tr>
+    </tr>
-            <td width="33%"><a href="static_assert_example_3.cpp">static_assert_example_3.cpp</a></td>
+    <tr>
-            <td width="33%">Yes</td>
+        <td width="33%"><a href="static_assert_example_2.cpp">static_assert_example_2.cpp</a></td>
-            <td width="34%">Class scope test program.</td>
+        <td width="33%">Yes</td>
-         </tr>
+        <td width="34%">Function scope test program.</td>
-         <tr>
+    </tr>
-            <td width="33%"><a href="static_assert_test_fail_1.cpp">static_assert_test_fail_1.cpp</a></td>
+    <tr>
-            <td width="33%">No</td>
+        <td width="33%"><a href="static_assert_example_3.cpp">static_assert_example_3.cpp</a></td>
-            <td width="34%">Illustrates failure at namespace scope.</td>
+        <td width="33%">Yes</td>
-         </tr>
+        <td width="34%">Class scope test program.</td>
-         <tr>
+    </tr>
-            <td width="33%"><a href="static_assert_test_fail_2.cpp">static_assert_test_fail_2.cpp</a></td>
+    <tr>
-            <td width="33%">No</td>
+        <td width="33%"><a href="static_assert_test_fail_1.cpp">static_assert_test_fail_1.cpp</a></td>
-            <td width="34%">Illustrates failure at non-template function scope.</td>
+        <td width="33%">No</td>
-         </tr>
+        <td width="34%">Illustrates failure at namespace scope.</td>
-         <tr>
+    </tr>
-            <td width="33%"><a href="static_assert_test_fail_3.cpp">static_assert_test_fail_3.cpp</a></td>
+    <tr>
-            <td width="33%">No</td>
+        <td width="33%"><a href="static_assert_test_fail_2.cpp">static_assert_test_fail_2.cpp</a></td>
-            <td width="34%">Illustrates failure at non-template class scope.</td>
+        <td width="33%">No</td>
-         </tr>
+        <td width="34%">Illustrates failure at non-template
-         <tr>
+        function scope.</td>
-            <td width="33%"><a href="static_assert_test_fail_4.cpp">static_assert_test_fail_4.cpp</a></td>
+    </tr>
-            <td width="33%">No</td>
+    <tr>
-            <td width="34%">Illustrates failure at non-template class scope.</td>
+        <td width="33%"><a href="static_assert_test_fail_3.cpp">static_assert_test_fail_3.cpp</a></td>
-         </tr>
+        <td width="33%">No</td>
-         <tr>
+        <td width="34%">Illustrates failure at non-template class
-            <td width="33%"><a href="static_assert_test_fail_5.cpp">static_assert_test_fail_5.cpp</a></td>
+        scope.</td>
-            <td width="33%">No</td>
+    </tr>
-            <td width="34%">Illustrates failure at template class scope.</td>
+    <tr>
-         </tr>
+        <td width="33%"><a href="static_assert_test_fail_4.cpp">static_assert_test_fail_4.cpp</a></td>
-         <tr>
+        <td width="33%">No</td>
-            <td width="33%"><a href="static_assert_test_fail_6.cpp">static_assert_test_fail_6.cpp</a></td>
+        <td width="34%">Illustrates failure at non-template class
-            <td width="33%">No</td>
+        scope.</td>
-            <td width="34%">Illustrates failure at template class member function scope.</td>
+    </tr>
-         </tr>
+    <tr>
-         <tr>
+        <td width="33%"><a href="static_assert_test_fail_5.cpp">static_assert_test_fail_5.cpp</a></td>
-            <td width="33%"><a href="static_assert_test_fail_7.cpp">static_assert_test_fail_7.cpp</a></td>
+        <td width="33%">No</td>
-            <td width="33%">No</td>
+        <td width="34%">Illustrates failure at template class
-            <td width="34%">Illustrates failure of class scope example.</td>
+        scope.</td>
-         </tr>
+    </tr>
-         <tr>
+    <tr>
-            <td><a href="static_assert_test_fail_8.cpp">static_assert_test_fail_8.cpp</a></td>
+        <td width="33%"><a href="static_assert_test_fail_6.cpp">static_assert_test_fail_6.cpp</a></td>
-            <td>No</td>
+        <td width="33%">No</td>
-            <td>Illustrates failure of function scope example.</td>
+        <td width="34%">Illustrates failure at template class
-         </tr>
+        member function scope.</td>
-         <tr>
+    </tr>
-            <td><a href="static_assert_test_fail_9.cpp">static_assert_test_fail_9.cpp</a></td>
+    <tr>
-            <td>No</td>
+        <td width="33%"><a href="static_assert_test_fail_7.cpp">static_assert_test_fail_7.cpp</a></td>
-            <td>Illustrates failure of function scope example (part 2).</td>
+        <td width="33%">No</td>
-         </tr>
+        <td width="34%">Illustrates failure of class scope
-      </table>
+        example.</td>
-      <hr>
+    </tr>
-      <p>Revised 27th Nov 2000</p>
+    <tr>
-      <p>Documentation <20> Copyright John Maddock 2000. Permission to copy, use, modify, 
+        <td><a href="static_assert_test_fail_8.cpp">static_assert_test_fail_8.cpp</a></td>
-         sell and distribute this document is granted provided this copyright notice 
+        <td>No</td>
-         appears in all copies. This document is provided "as is" without express or 
+        <td>Illustrates failure of function scope example.</td>
-         implied warranty, and with no claim as to its suitability for any purpose.</p>
+    </tr>
-      <p>Based on contributions by Steve Cleary and John Maddock.</p>
+    <tr>
-      <p>Maintained by <a href="mailto:john@johnmaddock.co.uk">John Maddock</a>, the 
+        <td><a href="static_assert_test_fail_9.cpp">static_assert_test_fail_9.cpp</a></td>
-         latest version of this file can be found at <a href="http://www.boost.org/">www.boost.org</a>, 
+        <td>No</td>
-         and the boost discussion list at <a href="http://www.yahoogroups.com/list/boost">www.yahoogroups.com/list/boost</a>.
+        <td>Illustrates failure of function scope example (part 2).</td>
-      </p>
+    </tr>
-      <p>&nbsp;</p>
+</table>
-      <p>&nbsp;</p>
+
-   </body>
+<hr>
 <p>Revised 27th Nov 2000</p>
 <p>Documentation <20> Copyright John Maddock 2000. Permission to
 copy, use, modify, sell and distribute this document is granted
 provided this copyright notice appears in all copies. This
 document is provided &quot;as is&quot; without express or implied
 warranty, and with no claim as to its suitability for any purpose.</p>
 <p>Based on contributions by Steve Cleary and John Maddock.</p>
 <p>Maintained by <a href="mailto:John_Maddock@compuserve.com">John
 Maddock</a>, the latest version of this file can be found at <a
 href="http://www.boost.org/">www.boost.org</a>, and the boost
 discussion list at <a
 href="http://www.yahoogroups.com/list/boost">www.yahoogroups.com/list/boost</a>.
 </p>
 <p>&nbsp;</p>
 <p>&nbsp;</p>
 </body>
 </html>
--- a/static_assert_example_1.cpp
+++ b/static_assert_example_1.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright Steve Cleary & John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -29,4 +30,3 @@ int main()
 }
--- a/static_assert_example_2.cpp
+++ b/static_assert_example_2.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -37,4 +38,3 @@ int main()
--- a/static_assert_example_3.cpp
+++ b/static_assert_example_3.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -29,4 +30,3 @@ int main()
 {
   return 0;
 }
--- a/static_assert_test.cpp
+++ b/static_assert_test.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright Steve Cleary & John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -83,4 +84,3 @@ int main()
--- a/static_assert_test_fail_1.cpp
+++ b/static_assert_test_fail_1.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright Steve Cleary & John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -10,12 +11,9 @@
 //
 // all these tests should fail:
 //
 typedef char a1[2];
 typedef char a2[3];
 // Namespace scope
-BOOST_STATIC_ASSERT(sizeof(a1) == sizeof(a2)); // will not compile
+BOOST_STATIC_ASSERT(sizeof(int) == sizeof(char)); // will not compile
--- a/static_assert_test_fail_2.cpp
+++ b/static_assert_test_fail_2.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright Steve Cleary & John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -10,16 +11,13 @@
 //
 // all these tests should fail:
 //
 typedef char a1[2];
 typedef char a2[3];
 // Function (block) scope
 void f()
 {
-  BOOST_STATIC_ASSERT(sizeof(a1) == sizeof(a2)); // should not compile
+  BOOST_STATIC_ASSERT(sizeof(int) == sizeof(char)); // should not compile
 }
--- a/static_assert_test_fail_3.cpp
+++ b/static_assert_test_fail_3.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright Steve Cleary & John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -10,13 +11,11 @@
 //
 // this tests should fail:
 //
 typedef char a1[2];
 typedef char a2[3];
 struct Bob
 {
  private:  // can be in private, to avoid namespace pollution
-    BOOST_STATIC_ASSERT(sizeof(a1) == sizeof(a2)); // will not compile
+    BOOST_STATIC_ASSERT(sizeof(int) == sizeof(char)); // will not compile
  public:
  // Member function scope: provides access to member variables
@ -28,6 +27,7 @@ struct Bob
    BOOST_STATIC_ASSERT(sizeof(x) == 4);
    BOOST_STATIC_ASSERT(sizeof(c) == 1);
 #endif
    //BOOST_STATIC_ASSERT((sizeof(x) == sizeof(c))); // should not compile
    return x;
  }
 };
@ -36,4 +36,3 @@ struct Bob
--- a/static_assert_test_fail_4.cpp
+++ b/static_assert_test_fail_4.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright Steve Cleary & John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -18,7 +19,7 @@ struct Bob
  public:
  // Member function scope: provides access to member variables
-  char x[4];
+  int x;
  char c;
  int f()
  {
@ -35,4 +36,3 @@ struct Bob
--- a/static_assert_test_fail_5.cpp
+++ b/static_assert_test_fail_5.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright Steve Cleary & John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -36,4 +37,3 @@ Bill<int, char> b;
--- a/static_assert_test_fail_6.cpp
+++ b/static_assert_test_fail_6.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright Steve Cleary & John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -43,4 +44,3 @@ void foo()
--- a/static_assert_test_fail_7.cpp
+++ b/static_assert_test_fail_7.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -28,4 +29,3 @@ int main()
 {
   return 0;
 }
--- a/static_assert_test_fail_8.cpp
+++ b/static_assert_test_fail_8.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -23,12 +24,6 @@ RandomAccessIterator foo(RandomAccessIterator from, RandomAccessIterator)
   return from;
 }
 // ensure that delayed instantiation compilers like Comeau see the failure early
 // enough for "compile-fail" testing with the Boost.Build testing framework. (Greg Comeau)
 template
 std::list<int>::iterator
   foo(std::list<int>::iterator, std::list<int>::iterator);
 int main()
 {
   std::deque<int> d;
@ -41,4 +36,3 @@ int main()
--- a/static_assert_test_fail_9.cpp
+++ b/static_assert_test_fail_9.cpp
@ -1,7 +1,8 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
+//  Permission to copy, use, modify, sell and
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  distribute this software is granted provided this copyright notice appears
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  in all copies. This software is provided "as is" without express or implied
 //  warranty, and with no claim as to its suitability for any purpose.
 //  See http://www.boost.org for most recent version including documentation.
@ -29,4 +30,3 @@ int main()
 {
   return 0;
 }