Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/range/detail/collection_traits.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/range/detail/collection_traits.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/range/detail/collection_traits.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -22,7 +22,6 @@ #ifndef BOOST_RANGE_STRING_COLLECTION_TRAITS_HPP #define BOOST_RANGE_STRING_COLLECTION_TRAITS_HPP -#include <boost/algorithm/string/config.hpp> #include <boost/type_traits/is_array.hpp> #include <boost/type_traits/is_pointer.hpp> #include <boost/mpl/eval_if.hpp> @@ -74,13 +73,13 @@ struct collection_traits { private: - typedef BOOST_STRING_TYPENAME ::boost::mpl::eval_if< + typedef typename ::boost::mpl::eval_if< ::boost::algorithm::detail::is_pair<T>, detail::pair_container_traits_selector<T>, - BOOST_STRING_TYPENAME ::boost::mpl::eval_if< + typename ::boost::mpl::eval_if< ::boost::is_array<T>, detail::array_container_traits_selector<T>, - BOOST_STRING_TYPENAME ::boost::mpl::eval_if< + typename ::boost::mpl::eval_if< ::boost::is_pointer<T>, detail::pointer_container_traits_selector<T>, detail::default_container_traits_selector<T> @@ -91,22 +90,22 @@ //! Function type typedef container_helper_type function_type; //! Value type - typedef BOOST_STRING_TYPENAME + typedef typename container_helper_type::value_type value_type; //! Size type - typedef BOOST_STRING_TYPENAME + typedef typename container_helper_type::size_type size_type; //! Iterator type - typedef BOOST_STRING_TYPENAME + typedef typename container_helper_type::iterator iterator; //! Const iterator type - typedef BOOST_STRING_TYPENAME + typedef typename container_helper_type::const_iterator const_iterator; //! Result iterator type ( iterator of const_iterator, depending on the constness of the container ) - typedef BOOST_STRING_TYPENAME + typedef typename container_helper_type::result_iterator result_iterator; //! Difference type - typedef BOOST_STRING_TYPENAME + typedef typename container_helper_type::difference_type difference_type; }; // 'collection_traits' @@ -120,7 +119,7 @@ template< typename C > struct value_type_of { - typedef BOOST_STRING_TYPENAME collection_traits<C>::value_type type; + typedef typename collection_traits<C>::value_type type; }; //! Container difference trait @@ -130,7 +129,7 @@ template< typename C > struct difference_type_of { - typedef BOOST_STRING_TYPENAME collection_traits<C>::difference_type type; + typedef typename collection_traits<C>::difference_type type; }; //! Container iterator trait @@ -140,7 +139,7 @@ template< typename C > struct iterator_of { - typedef BOOST_STRING_TYPENAME collection_traits<C>::iterator type; + typedef typename collection_traits<C>::iterator type; }; //! Container const_iterator trait @@ -150,7 +149,7 @@ template< typename C > struct const_iterator_of { - typedef BOOST_STRING_TYPENAME collection_traits<C>::const_iterator type; + typedef typename collection_traits<C>::const_iterator type; }; @@ -162,7 +161,7 @@ template< typename C > struct result_iterator_of { - typedef BOOST_STRING_TYPENAME collection_traits<C>::result_iterator type; + typedef typename collection_traits<C>::result_iterator type; }; // collection_traits related functions -----------------------------------------// @@ -172,7 +171,7 @@ Get the size of the container. Uses collection_traits. */ template< typename C > - inline BOOST_STRING_TYPENAME collection_traits<C>::size_type + inline typename collection_traits<C>::size_type size( const C& c ) { return collection_traits<C>::function_type::size( c ); @@ -195,7 +194,7 @@ Get the begin iterator of the container. Uses collection_traits. */ template< typename C > - inline BOOST_STRING_TYPENAME collection_traits<C>::iterator + inline typename collection_traits<C>::iterator begin( C& c ) { return collection_traits<C>::function_type::begin( c ); @@ -206,7 +205,7 @@ \overload */ template< typename C > - inline BOOST_STRING_TYPENAME collection_traits<C>::const_iterator + inline typename collection_traits<C>::const_iterator begin( const C& c ) { return collection_traits<C>::function_type::begin( c ); @@ -217,7 +216,7 @@ Get the begin iterator of the container. Uses collection_traits. */ template< typename C > - inline BOOST_STRING_TYPENAME collection_traits<C>::iterator + inline typename collection_traits<C>::iterator end( C& c ) { return collection_traits<C>::function_type::end( c ); @@ -228,7 +227,7 @@ \overload */ template< typename C > - inline BOOST_STRING_TYPENAME collection_traits<C>::const_iterator + inline typename collection_traits<C>::const_iterator end( const C& c ) { return collection_traits<C>::function_type::end( c ); @@ -241,7 +240,7 @@ \overload */ template< typename C > - inline BOOST_STRING_TYPENAME collection_traits<C>::result_iterator + inline typename collection_traits<C>::result_iterator begin( C& c ) { return collection_traits<C>::function_type::begin( c ); @@ -252,7 +251,7 @@ \overload */ template< typename C > - inline BOOST_STRING_TYPENAME collection_traits<C>::result_iterator + inline typename collection_traits<C>::result_iterator end( C& c ) { return collection_traits<C>::function_type::end( c );