This commit was manufactured by cvs2svn to create tag

'Version_1_30_0'. [SVN r18026]
This commit was manufactured by cvs2svn to create branch 'RC_1_30_0'.
2025-07-03 07:46:35 +02:00 · 2003-03-20 02:53:48 +00:00 · 2003-03-01 19:43:06 +00:00 · 2003-01-11 11:52:19 +00:00 · 2002-12-27 16:51:53 +00:00 · 2002-09-16 01:19:05 +00:00
8 changed files with 68 additions and 40 deletions
--- a/22
+++ b/22
@ -0,0 +1,22 @@
+subproject libs/static_assert ;
+# bring in the rules for testing
+SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
+include testing.jam ;
+
+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
@ -4,12 +4,12 @@
 //  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.
+//  See http://www.boost.org/libs/static_assert for documentation.

 /*
 Revision history:
- 	02 August 2000
- 		Initial version.
+   02 August 2000
+      Initial version.
 */

 #ifndef BOOST_STATIC_ASSERT_HPP
@ -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>{};
+template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };

 // HP aCC cannot deal with missing names for template value parameters
 template<int x> struct static_assert_test{};
@ -58,38 +58,34 @@ template<int x> struct static_assert_test{};
 // when used inside integral constant expressions.
 //
 #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_ASSERT_JOIN(boost_static_assert_typedef_, __LINE__)
-#else
+
+#if defined(BOOST_MSVC)
 // __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_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 ]
+#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 ) \
-   enum { BOOST_ASSERT_JOIN(boost_static_assert_enum_, __LINE__) \
+   enum { BOOST_JOIN(boost_static_assert_enum_, __LINE__) \
      = sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >) }
 #endif

-//
-// The following piece of macro magic joins the two 
-// arguments together, even when one of the arguments is
-// itself a macro (see 16.3.1 in C++ standard).  The key
-// is that macro expansion of macro arguments does not
-// occur in BOOST_DO_ASSERT_JOIN but does in BOOST_ASSERT_JOIN
-// provided it is called from within another macro.
-#define BOOST_ASSERT_JOIN( X, Y ) BOOST_DO_ASSERT_JOIN( X, Y )
-#define BOOST_DO_ASSERT_JOIN( X, Y ) X##Y

 #endif // BOOST_STATIC_ASSERT_HPP
-
-
-
-
--- a/index.html
+++ b/index.html
@ -0,0 +1,9 @@
+<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
@ -131,7 +131,7 @@ 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;template &lt;class UnsignedInt&gt;
+template &lt;class UnsignedInt&gt;
 class myclass
 {
 private:
--- a/static_assert_example_1.cpp
+++ b/static_assert_example_1.cpp
@ -10,7 +10,7 @@
 #include <cwchar>
 #include <boost/static_assert.hpp>

-#if defined(__BORLANDC__) && !defined(WCHAR_MIN)
+#if !defined(WCHAR_MIN)
 #define WCHAR_MIN 0
 #endif

@ -29,3 +29,4 @@ int main()
   return 0;
 }

+
--- a/static_assert_example_2.cpp
+++ b/static_assert_example_2.cpp
@ -26,11 +26,11 @@ RandomAccessIterator foo(RandomAccessIterator from, RandomAccessIterator to)

 int main()
 {
-	std::deque<int> d;
-	std::list<int> l;
-	foo(d.begin(), d.end()); // OK
-	//foo(l.begin(), l.end()); // error
-	return 0;
+   std::deque<int> d;
+   std::list<int> l;
+   foo(d.begin(), d.end()); // OK
+   //foo(l.begin(), l.end()); // error
+   return 0;
 }


--- a/static_assert_test_fail_4.cpp
+++ b/static_assert_test_fail_4.cpp
@ -23,7 +23,7 @@ struct Bob
  char c;
  int f()
  {
-#ifndef BOOST_MSVC // broken sizeof in VC6
+#if !defined(BOOST_MSVC) || BOOST_MSVC > 1200 // broken sizeof in VC6
    BOOST_STATIC_ASSERT(sizeof(x) == 4);
    BOOST_STATIC_ASSERT(sizeof(c) == 1);
    BOOST_STATIC_ASSERT((sizeof(x) == sizeof(c))); // should not compile
--- a/static_assert_test_fail_8.cpp
+++ b/static_assert_test_fail_8.cpp
@ -12,12 +12,12 @@
 #include <boost/static_assert.hpp>
 #include <boost/type_traits.hpp>

-template <class RandonAccessIterator >
-RandonAccessIterator foo(RandonAccessIterator from, RandonAccessIterator to)
+template <class RandomAccessIterator >
+RandomAccessIterator foo(RandomAccessIterator from, RandomAccessIterator)
 {
   // this template can only be used with
   // random access iterators...
-   typedef typename std::iterator_traits< RandonAccessIterator >::iterator_category cat;
+   typedef typename std::iterator_traits< RandomAccessIterator >::iterator_category cat;
   BOOST_STATIC_ASSERT((boost::is_convertible<cat*, std::random_access_iterator_tag*>::value));
   //
   // detail goes here...
@ -26,11 +26,11 @@ RandonAccessIterator foo(RandonAccessIterator from, RandonAccessIterator to)

 int main()
 {
-	std::deque<int> d;
-	std::list<int> l;
-	foo(d.begin(), d.end()); // OK
-	foo(l.begin(), l.end()); // error
-	return 0;
+   std::deque<int> d;
+   std::list<int> l;
+   foo(d.begin(), d.end()); // OK
+   foo(l.begin(), l.end()); // error
+   return 0;
 }
Author	SHA1	Message	Date
nobody	db34b5f8e1	This commit was manufactured by cvs2svn to create tag 'Version_1_30_0'. [SVN r18026]	2003-03-20 02:53:48 +00:00
nobody	8308b63aa8	This commit was manufactured by cvs2svn to create branch 'RC_1_30_0'. [SVN r17693]	2003-03-01 19:43:06 +00:00
John Maddock	02c6fb40a6	Modified Jamfile to use testing.jam [SVN r16868]	2003-01-11 11:52:19 +00:00
Beman Dawes	5ea88d2e64	add or update See www.boost.org comments [SVN r16708]	2002-12-27 16:51:53 +00:00
Aleksey Gurtovoy	1029ee8032	Intel C++ fix [SVN r15351]	2002-09-16 01:19:05 +00:00
Beman Dawes	f2732e699f	init commit [SVN r14977]	2002-08-19 23:29:18 +00:00
Dave Abrahams	9d3c2ed75f	Fix unversioned VC++ checks [SVN r14436]	2002-07-13 12:26:19 +00:00
Dave Abrahams	38b5799e33	respect <sysinclude> [SVN r13995]	2002-05-21 16:24:07 +00:00
Jens Maurer	22bb032a79	fix typo in template parameter name [SVN r13043]	2002-03-03 10:16:50 +00:00
John Maddock	f2725b11af	Fixed typo [SVN r12473]	2002-01-24 12:37:38 +00:00
John Maddock	3ab5f7708e	Stripped tabs from source [SVN r12351]	2002-01-19 12:38:14 +00:00
Darin Adler	07628a01a7	Fixed unused variables that show up as warnings when doing regression tests. [SVN r11241]	2001-09-24 23:21:16 +00:00
John Maddock	10425f4864	commit of split-config, including any changes required to existing libraries (mainly regex). [SVN r11138]	2001-09-18 11:13:39 +00:00
John Maddock	3bfec69135	Added Jamfile [SVN r11074]	2001-09-08 12:07:08 +00:00
John Maddock	90ff3895af	Fixed WCHAR_MIN issues [SVN r11073]	2001-09-08 12:06:21 +00:00