This commit was manufactured by cvs2svn to create branch

'python-v2-dev'. [SVN r14785]
2026-01-20 17:12:12 +00:00 · 2002-08-12 13:35:54 +00:00
2 changed files with 11 additions and 25 deletions
--- a/include/boost/static_assert.hpp
+++ b/include/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> { 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{};
@@ -58,28 +58,19 @@ template<int x> struct static_assert_test{};
 // when used inside integral constant expressions.
 //
 #if !defined(BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS) && !defined(__MWERKS__)
-
-#if defined(BOOST_MSVC)
+#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_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 ) \
@@ -89,3 +80,7 @@ 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>