Update of /cvsroot/boost/boost/boost/mpl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16000
Modified Files:
Tag: RC_1_34_0
assert.hpp
Log Message:
Restore status-quo for Borland
Index: assert.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/mpl/assert.hpp,v
retrieving revision 1.13.14.4
retrieving revision 1.13.14.5
diff -u -d -r1.13.14.4 -r1.13.14.5
--- assert.hpp 10 Nov 2006 00:39:04 -0000 1.13.14.4
+++ assert.hpp 10 Nov 2006 00:56:12 -0000 1.13.14.5
@@ -47,6 +47,12 @@
# define BOOST_MPL_CFG_ASSERT_BROKEN_POINTER_TO_POINTER_TO_MEMBER
#endif
+#if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+# define BOOST_MPL_AUX_ASSERT_CONSTANT(T, expr) enum { expr }
+#else
+# define BOOST_MPL_AUX_ASSERT_CONSTANT(T, expr) BOOST_STATIC_CONSTANT(T,
expr)
+#endif
+
BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
@@ -135,7 +141,7 @@
template< typename P > struct assert_arg_pred_not
{
typedef typename P::type p_type;
- BOOST_STATIC_CONSTANT( bool, p = !p_type::value );
+ BOOST_MPL_AUX_ASSERT_CONSTANT( bool, p = !p_type::value );
typedef typename assert_arg_pred_impl<p>::type type;
};
@@ -204,7 +210,7 @@
// BOOST_MPL_ASSERT((pred<x,...>))
#define BOOST_MPL_ASSERT(pred) \
-BOOST_STATIC_CONSTANT( \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
std::size_t \
, BOOST_PP_CAT(mpl_assertion_in_line_,__LINE__) = sizeof( \
boost::mpl::assertion_failed<false>( \
@@ -228,7 +234,7 @@
/**/
#else
# define BOOST_MPL_ASSERT_NOT(pred) \
-BOOST_STATIC_CONSTANT( \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
std::size_t \
, BOOST_PP_CAT(mpl_assertion_in_line_,__LINE__) = sizeof( \
boost::mpl::assertion_failed<false>( \
@@ -247,7 +253,7 @@
// agurt, 9/nov/06: 'enum' below is a workaround for gcc 4.0.4/4.1.1 bugs
#29522 and #29518
# define BOOST_MPL_ASSERT_RELATION(x, rel, y) \
enum { BOOST_PP_CAT(mpl_assert_rel_value,__LINE__) = (x rel y) }; \
-BOOST_STATIC_CONSTANT( \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
std::size_t \
, BOOST_PP_CAT(mpl_assertion_in_line_,__LINE__) = sizeof( \
boost::mpl::assertion_failed<BOOST_PP_CAT(mpl_assert_rel_value,__LINE__)>( \
@@ -263,14 +269,14 @@
/**/
# else
# define BOOST_MPL_ASSERT_RELATION(x, rel, y) \
-BOOST_STATIC_CONSTANT( \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
std::size_t \
, BOOST_PP_CAT(mpl_assert_rel,__LINE__) = sizeof( \
boost::mpl::assert_::arg rel boost::mpl::assert_::arg \
) \
); \
-BOOST_STATIC_CONSTANT( bool, BOOST_PP_CAT(mpl_assert_rel_value,__LINE__) = (x
rel y) ); \
-BOOST_STATIC_CONSTANT( \
+BOOST_MPL_AUX_ASSERT_CONSTANT( bool,
BOOST_PP_CAT(mpl_assert_rel_value,__LINE__) = (x rel y) ); \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
std::size_t \
, BOOST_PP_CAT(mpl_assertion_in_line_,__LINE__) = sizeof( \
boost::mpl::assertion_failed<BOOST_PP_CAT(mpl_assert_rel_value,__LINE__)>( \
@@ -289,7 +295,7 @@
# if defined(BOOST_MPL_CFG_ASSERT_BROKEN_POINTER_TO_POINTER_TO_MEMBER)
# define BOOST_MPL_ASSERT_RELATION(x, rel, y) \
-BOOST_STATIC_CONSTANT( \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
std::size_t \
, BOOST_PP_CAT(mpl_assertion_in_line_,__LINE__) = sizeof( \
boost::mpl::assertion_failed<(x rel y)>( boost::mpl::assert_rel_arg( \
@@ -300,7 +306,7 @@
/**/
# else
# define BOOST_MPL_ASSERT_RELATION(x, rel, y) \
-BOOST_STATIC_CONSTANT( \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
std::size_t \
, BOOST_PP_CAT(mpl_assertion_in_line_,__LINE__) = sizeof( \
boost::mpl::assertion_failed<(x rel y)>( (boost::mpl::failed
************ ( \
@@ -324,7 +330,7 @@
static boost::mpl::failed ************ (msg::************ assert_arg())
types_ \
{ return 0; } \
} BOOST_PP_CAT(mpl_assert_arg,__LINE__); \
-BOOST_STATIC_CONSTANT( \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
std::size_t \
, BOOST_PP_CAT(mpl_assertion_in_line_,__LINE__) = sizeof( \
boost::mpl::assertion<(c)>::failed(
BOOST_PP_CAT(mpl_assert_arg,__LINE__)::assert_arg() ) \
@@ -339,7 +345,7 @@
static boost::mpl::failed ************ (msg::************ assert_arg())
types_ \
{ return 0; } \
} BOOST_PP_CAT(mpl_assert_arg,__LINE__); \
-BOOST_STATIC_CONSTANT( \
+BOOST_MPL_AUX_ASSERT_CONSTANT( \
std::size_t \
, BOOST_PP_CAT(mpl_assertion_in_line_,__LINE__) = sizeof( \
boost::mpl::assertion_failed<(c)>(
BOOST_PP_CAT(mpl_assert_arg,__LINE__)::assert_arg() ) \
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
