From 64f50f82aa700ffefc4334206fe58f3553f4b3fd Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Sat, 30 Aug 2014 21:00:05 +0400 Subject: [PATCH] Removed workaround for Borland Compiler 5.9 to avoid dependency on TypeTraits. --- core/include/boost/mpl/has_xxx.hpp | 39 ------------------------------ 1 file changed, 39 deletions(-) diff --git a/core/include/boost/mpl/has_xxx.hpp b/core/include/boost/mpl/has_xxx.hpp index 82e67dd..1704d4b 100644 --- a/core/include/boost/mpl/has_xxx.hpp +++ b/core/include/boost/mpl/has_xxx.hpp @@ -33,10 +33,6 @@ #include #include -#if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x590) ) -# include -#endif - #if !defined(BOOST_MPL_CFG_NO_HAS_XXX) # if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) @@ -196,41 +192,6 @@ struct trait \ }; \ /**/ -# elif BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x590) ) - -# define BOOST_MPL_HAS_XXX_TRAIT_NAMED_BCB_DEF(trait, trait_tester, name, default_) \ -template< typename T, bool IS_CLASS > \ -struct trait_tester \ -{ \ - BOOST_STATIC_CONSTANT( bool, value = false ); \ -}; \ -template< typename T > \ -struct trait_tester< T, true > \ -{ \ - struct trait_tester_impl \ - { \ - template < class U > \ - static int resolve( boost::mpl::aux::type_wrapper const volatile * \ - , boost::mpl::aux::type_wrapper* = 0 ); \ - static char resolve( ... ); \ - }; \ - typedef boost::mpl::aux::type_wrapper t_; \ - BOOST_STATIC_CONSTANT( bool, value = ( sizeof( trait_tester_impl::resolve( static_cast< t_ * >(0) ) ) == sizeof(int) ) ); \ -}; \ -template< typename T, typename fallback_ = boost::mpl::bool_ > \ -struct trait \ -{ \ - BOOST_STATIC_CONSTANT( bool, value = (trait_tester< T, boost::is_class< T >::value >::value) ); \ - typedef boost::mpl::bool_< trait< T, fallback_ >::value > type; \ -}; - -# define BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(trait, name, default_) \ - BOOST_MPL_HAS_XXX_TRAIT_NAMED_BCB_DEF( trait \ - , BOOST_PP_CAT(trait,_tester) \ - , name \ - , default_ ) \ -/**/ - # else // other SFINAE-capable compilers # define BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(trait, name, default_) \