diff options
Diffstat (limited to 'boost/type_traits/is_base_of_tr1.hpp')
| -rw-r--r-- | boost/type_traits/is_base_of_tr1.hpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/boost/type_traits/is_base_of_tr1.hpp b/boost/type_traits/is_base_of_tr1.hpp index 7264f159fc..210bf54e7b 100644 --- a/boost/type_traits/is_base_of_tr1.hpp +++ b/boost/type_traits/is_base_of_tr1.hpp @@ -12,10 +12,6 @@ #include <boost/type_traits/is_base_and_derived.hpp> #include <boost/type_traits/is_same.hpp> #include <boost/type_traits/is_class.hpp> -#include <boost/type_traits/detail/ice_or.hpp> - -// should be the last #include -#include <boost/type_traits/detail/bool_trait_def.hpp> namespace boost { namespace tr1{ @@ -25,24 +21,17 @@ namespace boost { namespace tr1{ { typedef typename remove_cv<B>::type ncvB; typedef typename remove_cv<D>::type ncvD; - BOOST_STATIC_CONSTANT(bool, value = (::boost::type_traits::ice_or< - (::boost::detail::is_base_and_derived_impl<ncvB,ncvD>::value), - (::boost::is_same<ncvB,ncvD>::value)>::value)); + BOOST_STATIC_CONSTANT(bool, value = ((::boost::detail::is_base_and_derived_impl<ncvB,ncvD>::value) || (::boost::is_same<ncvB,ncvD>::value))); }; } -BOOST_TT_AUX_BOOL_TRAIT_DEF2( - is_base_of - , Base - , Derived - , (::boost::tr1::detail::is_base_of_imp<Base, Derived>::value)) + template <class Base, class Derived> struct is_base_of + : public integral_constant<bool, (::boost::tr1::detail::is_base_of_imp<Base, Derived>::value)>{}; -BOOST_TT_AUX_BOOL_TRAIT_PARTIAL_SPEC2_2(typename Base,typename Derived,is_base_of,Base&,Derived,false) -BOOST_TT_AUX_BOOL_TRAIT_PARTIAL_SPEC2_2(typename Base,typename Derived,is_base_of,Base,Derived&,false) -BOOST_TT_AUX_BOOL_TRAIT_PARTIAL_SPEC2_2(typename Base,typename Derived,is_base_of,Base&,Derived&,false) + template <class Base, class Derived> struct is_base_of<Base, Derived&> : public false_type{}; + template <class Base, class Derived> struct is_base_of<Base&, Derived&> : public false_type{}; + template <class Base, class Derived> struct is_base_of<Base&, Derived> : public false_type{}; } } // namespace boost -#include <boost/type_traits/detail/bool_trait_undef.hpp> - #endif // BOOST_TT_IS_BASE_OF_TR1_HPP_INCLUDED |