diff options
Diffstat (limited to 'boost/range/detail')
| -rw-r--r-- | boost/range/detail/any_iterator.hpp | 1 | ||||
| -rw-r--r-- | boost/range/detail/any_iterator_buffer.hpp | 2 | ||||
| -rw-r--r-- | boost/range/detail/join_iterator.hpp | 2 | ||||
| -rw-r--r-- | boost/range/detail/size_type.hpp | 33 |
4 files changed, 11 insertions, 27 deletions
diff --git a/boost/range/detail/any_iterator.hpp b/boost/range/detail/any_iterator.hpp index 107dfd6c54..5705ff010f 100644 --- a/boost/range/detail/any_iterator.hpp +++ b/boost/range/detail/any_iterator.hpp @@ -11,7 +11,6 @@ #define BOOST_RANGE_DETAIL_ANY_ITERATOR_HPP_INCLUDED #include <boost/cast.hpp> -#include <boost/utility.hpp> #include <boost/mpl/and.hpp> #include <boost/mpl/or.hpp> #include <boost/mpl/not.hpp> diff --git a/boost/range/detail/any_iterator_buffer.hpp b/boost/range/detail/any_iterator_buffer.hpp index 26c14206e9..2bb5d53a42 100644 --- a/boost/range/detail/any_iterator_buffer.hpp +++ b/boost/range/detail/any_iterator_buffer.hpp @@ -13,7 +13,7 @@ #include <boost/array.hpp> #include <boost/assert.hpp> #include <boost/static_assert.hpp> -#include <boost/utility.hpp> +#include <boost/noncopyable.hpp> namespace boost { diff --git a/boost/range/detail/join_iterator.hpp b/boost/range/detail/join_iterator.hpp index ce864676db..bbdeec7f11 100644 --- a/boost/range/detail/join_iterator.hpp +++ b/boost/range/detail/join_iterator.hpp @@ -23,7 +23,7 @@ #include <boost/range/empty.hpp> #include <boost/range/detail/demote_iterator_traversal_tag.hpp> #include <boost/range/value_type.hpp> -#include <boost/utility.hpp> +#include <boost/next_prior.hpp> namespace boost { diff --git a/boost/range/detail/size_type.hpp b/boost/range/detail/size_type.hpp index ec49f4d9ef..78a60a48e9 100644 --- a/boost/range/detail/size_type.hpp +++ b/boost/range/detail/size_type.hpp @@ -17,52 +17,37 @@ // missing partial specialization workaround. ////////////////////////////////////////////////////////////////////////////// -namespace boost +namespace boost { - namespace range_detail - { + namespace range_detail + { template< typename T > - struct range_size_type_; - - template<> - struct range_size_type_<std_container_> + struct range_size_type_ { template< typename C > struct pts { - typedef BOOST_RANGE_DEDUCED_TYPENAME C::size_type type; - }; - }; - - template<> - struct range_size_type_<std_pair_> - { - template< typename P > - struct pts - { typedef std::size_t type; }; }; template<> - struct range_size_type_<array_> + struct range_size_type_<std_container_> { - template< typename A > + template< typename C > struct pts { - typedef std::size_t type; + typedef BOOST_RANGE_DEDUCED_TYPENAME C::size_type type; }; }; + } - - } - template< typename C > class range_size { typedef typename range_detail::range<C>::type c_type; public: - typedef typename range_detail::range_size_type_<c_type>::BOOST_NESTED_TEMPLATE pts<C>::type type; + typedef typename range_detail::range_size_type_<c_type>::BOOST_NESTED_TEMPLATE pts<C>::type type; }; } |