boostorg/mpl
1
0
Fork 1
mirror of https://github.com/boostorg/mpl.git synced 2025-08-03 23:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix GCC regression

Browse Source 
[SVN r24911]
This commit is contained in:
Aleksey Gurtovoy
2004-09-05 09:08:26 +00:00
parent 8ef4119fde
commit ff6d082918
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/boost/mpl/assert.hpp
View File

@@ -24,6 +24,7 @@
#include <boost/mpl/aux_/config/nttp.hpp> #include <boost/mpl/aux_/config/nttp.hpp>
#include <boost/mpl/aux_/config/dtp.hpp> #include <boost/mpl/aux_/config/dtp.hpp>
#include <boost/mpl/aux_/config/gcc.hpp> #include <boost/mpl/aux_/config/gcc.hpp>
#include <boost/mpl/aux_/config/msvc.hpp>
#include <boost/mpl/aux_/config/workaround.hpp> #include <boost/mpl/aux_/config/workaround.hpp>
#include <boost/preprocessor/cat.hpp> #include <boost/preprocessor/cat.hpp>
@@ -45,9 +46,16 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
struct failed {}; struct failed {};
// agurt, 24/aug/04: MSVC 7.1 workaround here and below: return/accept // agurt, 24/aug/04: MSVC 7.1 workaround here and below: return/accept
// 'assert<false>' by reference // 'assert<false>' by reference; can't apply it unconditionally -- apparently it
// degrades quality of GCC diagnostics
#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
# define AUX778076_ASSERT_ARG(x) x&
#else
# define AUX778076_ASSERT_ARG(x) x
#endif
template< bool C > struct assert { typedef void* type; }; template< bool C > struct assert { typedef void* type; };
template<> struct assert<false> { typedef assert& type; }; template<> struct assert<false> { typedef AUX778076_ASSERT_ARG(assert) type; };
template< bool C > template< bool C >
int assertion_failed( typename assert<C>::type ); int assertion_failed( typename assert<C>::type );
@@ -122,11 +130,11 @@ failed ************ (boost::mpl::not_<Pred>::************
); );
template< typename Pred > template< typename Pred >
assert<false>& AUX778076_ASSERT_ARG(assert<false>)
assert_arg( void (*)(Pred), typename assert_arg_pred_not<Pred>::type ); assert_arg( void (*)(Pred), typename assert_arg_pred_not<Pred>::type );
template< typename Pred > template< typename Pred >
assert<false>& AUX778076_ASSERT_ARG(assert<false>)
assert_not_arg( void (*)(Pred), typename assert_arg_pred<Pred>::type ); assert_not_arg( void (*)(Pred), typename assert_arg_pred<Pred>::type );
@@ -140,7 +148,7 @@ template< bool c, typename Pred > struct assert_arg_type_impl
template< typename Pred > struct assert_arg_type_impl<true,Pred> template< typename Pred > struct assert_arg_type_impl<true,Pred>
{ {
typedef assert<false>& type; typedef AUX778076_ASSERT_ARG(assert<false>) type;
}; };
template< typename Pred > struct assert_arg_type template< typename Pred > struct assert_arg_type
@@ -166,7 +174,9 @@ typename assert_arg_type_impl< false,assert_relation<r,x,y> >::type
assert_rel_arg( assert_relation<r,x,y> ); assert_rel_arg( assert_relation<r,x,y> );
# endif # endif
#endif #endif // BOOST_MPL_CFG_ASSERT_BROKEN_POINTER_TO_POINTER_TO_MEMBER
#undef AUX778076_ASSERT_ARG
BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE