diff options
Diffstat (limited to 'boost/lambda/detail/operator_return_type_traits.hpp')
-rw-r--r-- | boost/lambda/detail/operator_return_type_traits.hpp | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/boost/lambda/detail/operator_return_type_traits.hpp b/boost/lambda/detail/operator_return_type_traits.hpp index b2d3d3ad9c..6af4d03671 100644 --- a/boost/lambda/detail/operator_return_type_traits.hpp +++ b/boost/lambda/detail/operator_return_type_traits.hpp @@ -12,7 +12,13 @@ #define BOOST_LAMBDA_OPERATOR_RETURN_TYPE_TRAITS_HPP #include "boost/lambda/detail/is_instance_of.hpp" -#include "boost/type_traits/same_traits.hpp" +#include "boost/type_traits/is_same.hpp" +#include "boost/type_traits/is_pointer.hpp" +#include "boost/type_traits/is_float.hpp" +#include "boost/type_traits/is_convertible.hpp" +#include "boost/type_traits/remove_pointer.hpp" +#include "boost/type_traits/remove_const.hpp" +#include "boost/type_traits/remove_reference.hpp" #include "boost/indirect_reference.hpp" #include "boost/detail/container_fwd.hpp" @@ -536,36 +542,6 @@ struct return_type_2<bitwise_action<Act>, A, B> namespace detail { -#ifdef BOOST_NO_TEMPLATED_STREAMS - -template<class A, class B> -struct leftshift_type { - - typedef typename detail::IF< - boost::is_convertible< - typename boost::remove_reference<A>::type*, - std::ostream* - >::value, - std::ostream&, - typename detail::remove_reference_and_cv<A>::type - >::RET type; -}; - -template<class A, class B> -struct rightshift_type { - - typedef typename detail::IF< - - boost::is_convertible< - typename boost::remove_reference<A>::type*, - std::istream* - >::value, - std::istream&, - typename detail::remove_reference_and_cv<A>::type - >::RET type; -}; - -#else template <class T> struct get_ostream_type { typedef std::basic_ostream<typename T::char_type, @@ -602,7 +578,6 @@ public: }; -#endif } // end detail |