Merge pull request #33 from tobias-loew/master

Ticket #10397 - compilation error with mfc-iteratior-support: ambiguous symbol
This commit is contained in:
neilgroves
2016-01-04 16:37:18 +00:00

View File

@ -36,7 +36,7 @@ namespace boost
BOOST_RANGE_EXTRACT_OPTIONAL_TYPE( const_iterator ) BOOST_RANGE_EXTRACT_OPTIONAL_TYPE( const_iterator )
template< typename C > template< typename C >
struct range_const_iterator struct range_const_iterator_helper
: extract_const_iterator<C> : extract_const_iterator<C>
{}; {};
@ -45,7 +45,7 @@ struct range_const_iterator
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
template< typename Iterator > template< typename Iterator >
struct range_const_iterator<std::pair<Iterator,Iterator> > struct range_const_iterator_helper<std::pair<Iterator,Iterator> >
{ {
typedef Iterator type; typedef Iterator type;
}; };
@ -55,7 +55,7 @@ struct range_const_iterator<std::pair<Iterator,Iterator> >
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
template< typename T, std::size_t sz > template< typename T, std::size_t sz >
struct range_const_iterator< T[sz] > struct range_const_iterator_helper< T[sz] >
{ {
typedef const T* type; typedef const T* type;
}; };
@ -64,7 +64,7 @@ struct range_const_iterator< T[sz] >
template<typename C, typename Enabler=void> template<typename C, typename Enabler=void>
struct range_const_iterator struct range_const_iterator
: range_detail::range_const_iterator< : range_detail::range_const_iterator_helper<
BOOST_DEDUCED_TYPENAME remove_reference<C>::type BOOST_DEDUCED_TYPENAME remove_reference<C>::type
> >
{ {