feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Eric Niebler
2016-11-18 21:28:24 -08:00
parent 5787c56994 7567dce0c1
commit 67c18ac1f1
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/range/const_iterator.hpp
+4 -4
View File
@@ -36,7 +36,7 @@ namespace boost
BOOST_RANGE_EXTRACT_OPTIONAL_TYPE( const_iterator )
template< typename C >
struct range_const_iterator
struct range_const_iterator_helper
: extract_const_iterator<C>
{};
@@ -45,7 +45,7 @@ struct range_const_iterator
//////////////////////////////////////////////////////////////////////////
template< typename Iterator >
struct range_const_iterator<std::pair<Iterator,Iterator> >
struct range_const_iterator_helper<std::pair<Iterator,Iterator> >
{
typedef Iterator type;
};
@@ -55,7 +55,7 @@ struct range_const_iterator<std::pair<Iterator,Iterator> >
//////////////////////////////////////////////////////////////////////////
template< typename T, std::size_t sz >
struct range_const_iterator< T[sz] >
struct range_const_iterator_helper< T[sz] >
{
typedef const T* type;
};
@@ -64,7 +64,7 @@ struct range_const_iterator< T[sz] >
template<typename C, typename Enabler=void>
struct range_const_iterator
: range_detail::range_const_iterator<
: range_detail::range_const_iterator_helper<
BOOST_DEDUCED_TYPENAME remove_reference<C>::type
>
{
include/boost/range/detail/any_iterator.hpp
+2 -3
View File
@@ -247,9 +247,8 @@ namespace boost
any_iterator_type stored_iterator;
};
}
}
} //namespace detail
} //namespace iterators
namespace range_detail
{