complie fix

[lyx.git] / boost / boost / static_assert.hpp

diff --git a/boost/boost/static_assert.hpp b/boost/boost/static_assert.hpp
index af421736e3e960ed8acc278d4ca565e5436af5d0..b28a55cd828122f4013092e32ded04e90e9eed5e 100644 (file)
--- a/boost/boost/static_assert.hpp
+++ b/boost/boost/static_assert.hpp
@@ -8,8 +8,8 @@
 
 /*
  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{};
@@ -53,40 +53,39 @@ template<int x> struct static_assert_test{};
 // an eye catching error message.  The result of the sizeof expression is either
 // used as an enum initialiser, or as a template argument depending which version
 // is in use...
+// Note that the argument to the assert is explicitly cast to bool using old-
+// style casts: too many compilers currently have problems with static_cast
+// 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
-
-
-
-