This commit was manufactured by cvs2svn to create branch

'python-v2-dev'.

[SVN r14785]

Jamfile

@@ -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) : ;
 
 

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 ]
-;
-
-
-
-
-

include/boost/static_assert.hpp

@@ -1,9 +1,10 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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__
 //
@@ -28,7 +28,7 @@ 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{};
@@ -57,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) && \
-    !BOOST_WORKAROUND(__MWERKS__, < 0x3003)
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#if !defined(BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS) && !defined(__MWERKS__)
+#ifndef 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_, __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)
-// 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 ) \
@@ -106,3 +82,5 @@ template<int x> struct static_assert_test{};
 #endif // BOOST_STATIC_ASSERT_HPP
 
 
+
+

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>

static_assert.htm

@@ -265,7 +265,7 @@ 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@johnmaddock.co.uk">John
+<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

static_assert_example_1.cpp

@@ -1,7 +1,8 @@
 //  (C) Copyright Steve Cleary & John Maddock 2000.
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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()
 }
 
 
-

static_assert_example_2.cpp

@@ -1,7 +1,8 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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()
 
 
 
-

static_assert_example_3.cpp

@@ -1,7 +1,8 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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;
 }
-

static_assert_test.cpp

@@ -1,7 +1,8 @@
 //  (C) Copyright Steve Cleary & John Maddock 2000.
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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()
 
 
 
-

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 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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
 
 
 

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 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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
 }
 
 
 
 
-

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 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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
 
 
 
-

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 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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
 
 
 
-

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 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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;
 
 
 
-

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 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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()
 
 
 
-

static_assert_test_fail_7.cpp

@@ -1,7 +1,8 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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;
 }
-

static_assert_test_fail_8.cpp

@@ -1,7 +1,8 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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()
 
  
 
-

static_assert_test_fail_9.cpp

@@ -1,7 +1,8 @@
 //  (C) Copyright John Maddock 2000.
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Permission to copy, use, modify, sell and
+//  distribute this software is granted provided this copyright notice appears
+//  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;
 }
-